diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 8f82d24..93012a1 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,8 @@
   receiveStatus: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -75,9 +77,14 @@
     value: 'createTime',
     align: 'center',
   },
+  // {
+  //   text: '送检人',
+  //   value: 'deliverer',
+  //   align: 'center',
+  // },
   {
-    text: '送检人',
-    value: 'deliverer',
+    text: '计划送检时间',
+    value: 'requireOverTime',
     align: 'center',
   },
   {
@@ -124,6 +131,8 @@
   listQuery.receiveStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 8f82d24..93012a1 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,8 @@
   receiveStatus: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -75,9 +77,14 @@
     value: 'createTime',
     align: 'center',
   },
+  // {
+  //   text: '送检人',
+  //   value: 'deliverer',
+  //   align: 'center',
+  // },
   {
-    text: '送检人',
-    value: 'deliverer',
+    text: '计划送检时间',
+    value: 'requireOverTime',
     align: 'center',
   },
   {
@@ -124,6 +131,8 @@
   listQuery.receiveStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index aeb0919..5aa8c70 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,6 +23,9 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
+  sort: 'desc',
+  orderBy: 'create_time',
+
 })
 const columns = ref([
   {
@@ -143,6 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称
@@ -167,7 +172,7 @@
   // 规格型号
   getModelAllList({}).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
   getDeptList({}).then((res) => {
@@ -193,16 +198,16 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听所在单位，修改部门
 watch(() => listQuery.companyId, (newVal) => {
-  listQuery.deptIds = ''
+  listQuery.deptId = ''
   if (newVal) {
     getDeptTreeList({ pid: newVal }).then((res) => {
       deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
@@ -294,7 +299,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 8f82d24..93012a1 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,8 @@
   receiveStatus: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -75,9 +77,14 @@
     value: 'createTime',
     align: 'center',
   },
+  // {
+  //   text: '送检人',
+  //   value: 'deliverer',
+  //   align: 'center',
+  // },
   {
-    text: '送检人',
-    value: 'deliverer',
+    text: '计划送检时间',
+    value: 'requireOverTime',
     align: 'center',
   },
   {
@@ -124,6 +131,8 @@
   listQuery.receiveStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index aeb0919..5aa8c70 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,6 +23,9 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
+  sort: 'desc',
+  orderBy: 'create_time',
+
 })
 const columns = ref([
   {
@@ -143,6 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称
@@ -167,7 +172,7 @@
   // 规格型号
   getModelAllList({}).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
   getDeptList({}).then((res) => {
@@ -193,16 +198,16 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听所在单位，修改部门
 watch(() => listQuery.companyId, (newVal) => {
-  listQuery.deptIds = ''
+  listQuery.deptId = ''
   if (newVal) {
     getDeptTreeList({ pid: newVal }).then((res) => {
       deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
@@ -294,7 +299,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index e4067bc..e000159 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -17,6 +17,8 @@
   subSystemId: '', // 分系统
   groupName: '', // 分组名称
   createUserId: userStore.id, // 分组名称
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -97,6 +99,8 @@
   checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 8f82d24..93012a1 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,8 @@
   receiveStatus: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -75,9 +77,14 @@
     value: 'createTime',
     align: 'center',
   },
+  // {
+  //   text: '送检人',
+  //   value: 'deliverer',
+  //   align: 'center',
+  // },
   {
-    text: '送检人',
-    value: 'deliverer',
+    text: '计划送检时间',
+    value: 'requireOverTime',
     align: 'center',
   },
   {
@@ -124,6 +131,8 @@
   listQuery.receiveStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index aeb0919..5aa8c70 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,6 +23,9 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
+  sort: 'desc',
+  orderBy: 'create_time',
+
 })
 const columns = ref([
   {
@@ -143,6 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称
@@ -167,7 +172,7 @@
   // 规格型号
   getModelAllList({}).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
   getDeptList({}).then((res) => {
@@ -193,16 +198,16 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听所在单位，修改部门
 watch(() => listQuery.companyId, (newVal) => {
-  listQuery.deptIds = ''
+  listQuery.deptId = ''
   if (newVal) {
     getDeptTreeList({ pid: newVal }).then((res) => {
       deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
@@ -294,7 +299,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index e4067bc..e000159 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -17,6 +17,8 @@
   subSystemId: '', // 分系统
   groupName: '', // 分组名称
   createUserId: userStore.id, // 分组名称
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -97,6 +99,8 @@
   checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index 645d7a4..46a1bb8 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -16,9 +16,10 @@
 // 获取信息变更记录
 const infoList = ref()
 const fetchData = (id: string) => {
-  if (!approvalId.value) { return }
+  // if (!approvalId.value) { return }
   devcieInfoChange({ equipmentId: id }).then((res) => {
-    console.log(res.data, '设备变更记录')
+    // console.log(id, '123123213231213')
+    console.log(res.data, '变更记录1111')
     infoList.value = res.data
   })
 }

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 8f82d24..93012a1 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,8 @@
   receiveStatus: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -75,9 +77,14 @@
     value: 'createTime',
     align: 'center',
   },
+  // {
+  //   text: '送检人',
+  //   value: 'deliverer',
+  //   align: 'center',
+  // },
   {
-    text: '送检人',
-    value: 'deliverer',
+    text: '计划送检时间',
+    value: 'requireOverTime',
     align: 'center',
   },
   {
@@ -124,6 +131,8 @@
   listQuery.receiveStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index aeb0919..5aa8c70 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,6 +23,9 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
+  sort: 'desc',
+  orderBy: 'create_time',
+
 })
 const columns = ref([
   {
@@ -143,6 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称
@@ -167,7 +172,7 @@
   // 规格型号
   getModelAllList({}).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
   getDeptList({}).then((res) => {
@@ -193,16 +198,16 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听所在单位，修改部门
 watch(() => listQuery.companyId, (newVal) => {
-  listQuery.deptIds = ''
+  listQuery.deptId = ''
   if (newVal) {
     getDeptTreeList({ pid: newVal }).then((res) => {
       deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
@@ -294,7 +299,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index e4067bc..e000159 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -17,6 +17,8 @@
   subSystemId: '', // 分系统
   groupName: '', // 分组名称
   createUserId: userStore.id, // 分组名称
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -97,6 +99,8 @@
   checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index 645d7a4..46a1bb8 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -16,9 +16,10 @@
 // 获取信息变更记录
 const infoList = ref()
 const fetchData = (id: string) => {
-  if (!approvalId.value) { return }
+  // if (!approvalId.value) { return }
   devcieInfoChange({ equipmentId: id }).then((res) => {
-    console.log(res.data, '设备变更记录')
+    // console.log(id, '123123213231213')
+    console.log(res.data, '变更记录1111')
     infoList.value = res.data
   })
 }
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 20986e9..2b0942b 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -176,12 +176,13 @@
 const installLocationList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const usePositionAllList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
   const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
-  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   const res1 = await getDictByCode('eqptDeviceUseStatus')
   useStatusList.value = res1.data
   getDictByCode('eqptDeviceLevel').then((res) => {
@@ -205,10 +206,9 @@
     // console.log(res.data, '设备名称')
   })
   // 使用岗位
-  getUserDept().then((res1) => {
-    getPostList({ searchId: $route.path.includes('detail') ? '' : res1.data.id }).then((res) => {
-      usePositionList.value = res.data
-    })
+  getPostList({ }).then((res) => {
+    usePositionList.value = res.data
+    usePositionAllList.value = res.data
   })
   // 安装位置
   getLocationList().then((res) => {
@@ -225,13 +225,13 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
     // console.log(modelList.value, helpList.value)
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -256,10 +256,10 @@
     }
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 设备相关，填充数据
@@ -302,6 +302,24 @@
   deep: true,
   immediate: true,
 })
+// 监听使用部门部门变化修改 使用岗位
+watch(() => ruleForm.value.deptId, (newVal) => {
+  if ($route.path.includes('detail') || isFrist.value) {
+    return
+  }
+  ruleForm.value.usePositionId = ''
+  if (newVal) {
+    getPostList({ searchId: newVal }).then((res) => {
+      usePositionList.value = res.data
+    })
+  }
+  else {
+    usePositionList.value = usePositionAllList.value
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 8f82d24..93012a1 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,8 @@
   receiveStatus: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -75,9 +77,14 @@
     value: 'createTime',
     align: 'center',
   },
+  // {
+  //   text: '送检人',
+  //   value: 'deliverer',
+  //   align: 'center',
+  // },
   {
-    text: '送检人',
-    value: 'deliverer',
+    text: '计划送检时间',
+    value: 'requireOverTime',
     align: 'center',
   },
   {
@@ -124,6 +131,8 @@
   listQuery.receiveStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index aeb0919..5aa8c70 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,6 +23,9 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
+  sort: 'desc',
+  orderBy: 'create_time',
+
 })
 const columns = ref([
   {
@@ -143,6 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称
@@ -167,7 +172,7 @@
   // 规格型号
   getModelAllList({}).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
   getDeptList({}).then((res) => {
@@ -193,16 +198,16 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听所在单位，修改部门
 watch(() => listQuery.companyId, (newVal) => {
-  listQuery.deptIds = ''
+  listQuery.deptId = ''
   if (newVal) {
     getDeptTreeList({ pid: newVal }).then((res) => {
       deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
@@ -294,7 +299,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index e4067bc..e000159 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -17,6 +17,8 @@
   subSystemId: '', // 分系统
   groupName: '', // 分组名称
   createUserId: userStore.id, // 分组名称
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -97,6 +99,8 @@
   checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index 645d7a4..46a1bb8 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -16,9 +16,10 @@
 // 获取信息变更记录
 const infoList = ref()
 const fetchData = (id: string) => {
-  if (!approvalId.value) { return }
+  // if (!approvalId.value) { return }
   devcieInfoChange({ equipmentId: id }).then((res) => {
-    console.log(res.data, '设备变更记录')
+    // console.log(id, '123123213231213')
+    console.log(res.data, '变更记录1111')
     infoList.value = res.data
   })
 }
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 20986e9..2b0942b 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -176,12 +176,13 @@
 const installLocationList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const usePositionAllList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
   const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
-  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   const res1 = await getDictByCode('eqptDeviceUseStatus')
   useStatusList.value = res1.data
   getDictByCode('eqptDeviceLevel').then((res) => {
@@ -205,10 +206,9 @@
     // console.log(res.data, '设备名称')
   })
   // 使用岗位
-  getUserDept().then((res1) => {
-    getPostList({ searchId: $route.path.includes('detail') ? '' : res1.data.id }).then((res) => {
-      usePositionList.value = res.data
-    })
+  getPostList({ }).then((res) => {
+    usePositionList.value = res.data
+    usePositionAllList.value = res.data
   })
   // 安装位置
   getLocationList().then((res) => {
@@ -225,13 +225,13 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
     // console.log(modelList.value, helpList.value)
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -256,10 +256,10 @@
     }
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 设备相关，填充数据
@@ -302,6 +302,24 @@
   deep: true,
   immediate: true,
 })
+// 监听使用部门部门变化修改 使用岗位
+watch(() => ruleForm.value.deptId, (newVal) => {
+  if ($route.path.includes('detail') || isFrist.value) {
+    return
+  }
+  ruleForm.value.usePositionId = ''
+  if (newVal) {
+    getPostList({ searchId: newVal }).then((res) => {
+      usePositionList.value = res.data
+    })
+  }
+  else {
+    usePositionList.value = usePositionAllList.value
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2ae9308..9bd395a 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -77,8 +77,8 @@
   meterIdentify: '', // 计量标识
   checkDateEnd: '',
   checkDateStart: '',
-  sort: '',
-  orderBy: '',
+  sort: 'desc',
+  orderBy: 'create_time',
   manufacturer: '', // 生产厂家
   groupId: '', // 分组
   directorId: '',
@@ -325,7 +325,7 @@
   // 规格型号
   getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -371,11 +371,11 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听单位，修改部门
@@ -437,13 +437,13 @@
   listQuery.checkDateEnd = ''
   listQuery.taskId = ''
   listQuery.meterIdentify = ''
-  listQuery.sort = ''
-  listQuery.orderBy = ''
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   listQuery.manufacturer = ''
   listQuery.groupId = ''
   listQuery.directorId = ''
   checked.value = true
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   if (refresh) {

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 8f82d24..93012a1 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,8 @@
   receiveStatus: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -75,9 +77,14 @@
     value: 'createTime',
     align: 'center',
   },
+  // {
+  //   text: '送检人',
+  //   value: 'deliverer',
+  //   align: 'center',
+  // },
   {
-    text: '送检人',
-    value: 'deliverer',
+    text: '计划送检时间',
+    value: 'requireOverTime',
     align: 'center',
   },
   {
@@ -124,6 +131,8 @@
   listQuery.receiveStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index aeb0919..5aa8c70 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,6 +23,9 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
+  sort: 'desc',
+  orderBy: 'create_time',
+
 })
 const columns = ref([
   {
@@ -143,6 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称
@@ -167,7 +172,7 @@
   // 规格型号
   getModelAllList({}).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
   getDeptList({}).then((res) => {
@@ -193,16 +198,16 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听所在单位，修改部门
 watch(() => listQuery.companyId, (newVal) => {
-  listQuery.deptIds = ''
+  listQuery.deptId = ''
   if (newVal) {
     getDeptTreeList({ pid: newVal }).then((res) => {
       deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
@@ -294,7 +299,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index e4067bc..e000159 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -17,6 +17,8 @@
   subSystemId: '', // 分系统
   groupName: '', // 分组名称
   createUserId: userStore.id, // 分组名称
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -97,6 +99,8 @@
   checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index 645d7a4..46a1bb8 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -16,9 +16,10 @@
 // 获取信息变更记录
 const infoList = ref()
 const fetchData = (id: string) => {
-  if (!approvalId.value) { return }
+  // if (!approvalId.value) { return }
   devcieInfoChange({ equipmentId: id }).then((res) => {
-    console.log(res.data, '设备变更记录')
+    // console.log(id, '123123213231213')
+    console.log(res.data, '变更记录1111')
     infoList.value = res.data
   })
 }
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 20986e9..2b0942b 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -176,12 +176,13 @@
 const installLocationList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const usePositionAllList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
   const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
-  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   const res1 = await getDictByCode('eqptDeviceUseStatus')
   useStatusList.value = res1.data
   getDictByCode('eqptDeviceLevel').then((res) => {
@@ -205,10 +206,9 @@
     // console.log(res.data, '设备名称')
   })
   // 使用岗位
-  getUserDept().then((res1) => {
-    getPostList({ searchId: $route.path.includes('detail') ? '' : res1.data.id }).then((res) => {
-      usePositionList.value = res.data
-    })
+  getPostList({ }).then((res) => {
+    usePositionList.value = res.data
+    usePositionAllList.value = res.data
   })
   // 安装位置
   getLocationList().then((res) => {
@@ -225,13 +225,13 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
     // console.log(modelList.value, helpList.value)
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -256,10 +256,10 @@
     }
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 设备相关，填充数据
@@ -302,6 +302,24 @@
   deep: true,
   immediate: true,
 })
+// 监听使用部门部门变化修改 使用岗位
+watch(() => ruleForm.value.deptId, (newVal) => {
+  if ($route.path.includes('detail') || isFrist.value) {
+    return
+  }
+  ruleForm.value.usePositionId = ''
+  if (newVal) {
+    getPostList({ searchId: newVal }).then((res) => {
+      usePositionList.value = res.data
+    })
+  }
+  else {
+    usePositionList.value = usePositionAllList.value
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2ae9308..9bd395a 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -77,8 +77,8 @@
   meterIdentify: '', // 计量标识
   checkDateEnd: '',
   checkDateStart: '',
-  sort: '',
-  orderBy: '',
+  sort: 'desc',
+  orderBy: 'create_time',
   manufacturer: '', // 生产厂家
   groupId: '', // 分组
   directorId: '',
@@ -325,7 +325,7 @@
   // 规格型号
   getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -371,11 +371,11 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听单位，修改部门
@@ -437,13 +437,13 @@
   listQuery.checkDateEnd = ''
   listQuery.taskId = ''
   listQuery.meterIdentify = ''
-  listQuery.sort = ''
-  listQuery.orderBy = ''
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   listQuery.manufacturer = ''
   listQuery.groupId = ''
   listQuery.directorId = ''
   checked.value = true
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   if (refresh) {
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
index 91864e1..2edd7d4 100644
--- a/src/views/tested/device/model/components/list.vue
+++ b/src/views/tested/device/model/components/list.vue
@@ -17,6 +17,8 @@
   model: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -190,8 +192,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 fetchSelect()
@@ -207,8 +209,8 @@
     })
     getModelAllList({ equipmentType: newVal }).then((res) => {
       allList.value = res.data
-      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
     })
   }
   else {
@@ -218,8 +220,8 @@
     })
     getModelAllList({ equipmentType: '' }).then((res) => {
       allList.value = res.data
-      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
     })
   }
 }, {
@@ -232,12 +234,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -245,13 +247,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -261,8 +263,10 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 8f82d24..93012a1 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,8 @@
   receiveStatus: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -75,9 +77,14 @@
     value: 'createTime',
     align: 'center',
   },
+  // {
+  //   text: '送检人',
+  //   value: 'deliverer',
+  //   align: 'center',
+  // },
   {
-    text: '送检人',
-    value: 'deliverer',
+    text: '计划送检时间',
+    value: 'requireOverTime',
     align: 'center',
   },
   {
@@ -124,6 +131,8 @@
   listQuery.receiveStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index aeb0919..5aa8c70 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,6 +23,9 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
+  sort: 'desc',
+  orderBy: 'create_time',
+
 })
 const columns = ref([
   {
@@ -143,6 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称
@@ -167,7 +172,7 @@
   // 规格型号
   getModelAllList({}).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
   getDeptList({}).then((res) => {
@@ -193,16 +198,16 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听所在单位，修改部门
 watch(() => listQuery.companyId, (newVal) => {
-  listQuery.deptIds = ''
+  listQuery.deptId = ''
   if (newVal) {
     getDeptTreeList({ pid: newVal }).then((res) => {
       deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
@@ -294,7 +299,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index e4067bc..e000159 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -17,6 +17,8 @@
   subSystemId: '', // 分系统
   groupName: '', // 分组名称
   createUserId: userStore.id, // 分组名称
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -97,6 +99,8 @@
   checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index 645d7a4..46a1bb8 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -16,9 +16,10 @@
 // 获取信息变更记录
 const infoList = ref()
 const fetchData = (id: string) => {
-  if (!approvalId.value) { return }
+  // if (!approvalId.value) { return }
   devcieInfoChange({ equipmentId: id }).then((res) => {
-    console.log(res.data, '设备变更记录')
+    // console.log(id, '123123213231213')
+    console.log(res.data, '变更记录1111')
     infoList.value = res.data
   })
 }
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 20986e9..2b0942b 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -176,12 +176,13 @@
 const installLocationList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const usePositionAllList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
   const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
-  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   const res1 = await getDictByCode('eqptDeviceUseStatus')
   useStatusList.value = res1.data
   getDictByCode('eqptDeviceLevel').then((res) => {
@@ -205,10 +206,9 @@
     // console.log(res.data, '设备名称')
   })
   // 使用岗位
-  getUserDept().then((res1) => {
-    getPostList({ searchId: $route.path.includes('detail') ? '' : res1.data.id }).then((res) => {
-      usePositionList.value = res.data
-    })
+  getPostList({ }).then((res) => {
+    usePositionList.value = res.data
+    usePositionAllList.value = res.data
   })
   // 安装位置
   getLocationList().then((res) => {
@@ -225,13 +225,13 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
     // console.log(modelList.value, helpList.value)
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -256,10 +256,10 @@
     }
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 设备相关，填充数据
@@ -302,6 +302,24 @@
   deep: true,
   immediate: true,
 })
+// 监听使用部门部门变化修改 使用岗位
+watch(() => ruleForm.value.deptId, (newVal) => {
+  if ($route.path.includes('detail') || isFrist.value) {
+    return
+  }
+  ruleForm.value.usePositionId = ''
+  if (newVal) {
+    getPostList({ searchId: newVal }).then((res) => {
+      usePositionList.value = res.data
+    })
+  }
+  else {
+    usePositionList.value = usePositionAllList.value
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2ae9308..9bd395a 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -77,8 +77,8 @@
   meterIdentify: '', // 计量标识
   checkDateEnd: '',
   checkDateStart: '',
-  sort: '',
-  orderBy: '',
+  sort: 'desc',
+  orderBy: 'create_time',
   manufacturer: '', // 生产厂家
   groupId: '', // 分组
   directorId: '',
@@ -325,7 +325,7 @@
   // 规格型号
   getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -371,11 +371,11 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听单位，修改部门
@@ -437,13 +437,13 @@
   listQuery.checkDateEnd = ''
   listQuery.taskId = ''
   listQuery.meterIdentify = ''
-  listQuery.sort = ''
-  listQuery.orderBy = ''
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   listQuery.manufacturer = ''
   listQuery.groupId = ''
   listQuery.directorId = ''
   checked.value = true
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   if (refresh) {
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
index 91864e1..2edd7d4 100644
--- a/src/views/tested/device/model/components/list.vue
+++ b/src/views/tested/device/model/components/list.vue
@@ -17,6 +17,8 @@
   model: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -190,8 +192,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 fetchSelect()
@@ -207,8 +209,8 @@
     })
     getModelAllList({ equipmentType: newVal }).then((res) => {
       allList.value = res.data
-      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
     })
   }
   else {
@@ -218,8 +220,8 @@
     })
     getModelAllList({ equipmentType: '' }).then((res) => {
       allList.value = res.data
-      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
     })
   }
 }, {
@@ -232,12 +234,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -245,13 +247,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -261,8 +263,10 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 4761b98..50d65d9 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -29,6 +29,8 @@
   model: '',
   useSign: '',
   checkStatus: '',
+  sort: 'desc',
+  orderBy: 'certificate_valid',
   offset: 1,
   limit: 20,
 })
@@ -160,6 +162,8 @@
   listQuery.useSign = ''
   listQuery.limit = 20
   listQuery.offset = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'certificate_valid'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -252,7 +256,8 @@
 const inUseList = ref<{ id: string; value: string; name: string }[]>()
 const fetchStatusList = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
-    useStatusList.value = res.data
+    const arr = ['在用', '禁用', '延用']
+    useStatusList.value = res.data.filter((item: any) => arr.includes(item.name))
   })
   // 设备名称
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
@@ -261,7 +266,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -312,11 +317,11 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>

diff --git a/public/config/config.json b/public/config/config.json
index 3c4d7af..03859f6 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.0",
+  "versionByEqpt":"1.2.0.1",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 622f5c3..44824e3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getCertificateList(data: any) {
   return request({
-    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d2c2999..19f26eb 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -5,7 +5,7 @@
 // 分组列表
 export function getGroupList(params: any) {
   return request({
-    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
index 6940165..99bef72 100644
--- a/src/api/eqpt/device/model.ts
+++ b/src/api/eqpt/device/model.ts
@@ -6,7 +6,7 @@
 // 列表
 export function getModelList(params: any) {
   return request({
-    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort || ''}&orderBy=${params.orderBy || ''}`,
     method: 'post',
     data: params,
   })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index c9d2d06..407ad5e 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -5,7 +5,7 @@
 // 列表
 export function getRemindList(data: any) {
   return request({
-    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index 46b35fe..f0e9594 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分页列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/order/listPage',
+    url: `/business/order/listPage?limit=${data.limit}&offset=${data.offset}&sort=${data.sort || ''}&orderBy=${data.orderBy || ''}`,
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 64e6f48..5a31c59 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -115,10 +115,12 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  listQuery.value.processId = val!
-  getDict().then(() => {
-    fetchData()
-  })
+  if (val) {
+    listQuery.value.processId = val!
+    getDict().then(() => {
+      fetchData()
+    })
+  }
 }, { immediate: true })
 </script>
 
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index b25a74b..dea6ae5 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -100,7 +100,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -120,8 +120,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 const click = () => {}
@@ -133,12 +133,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -146,13 +146,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -161,8 +161,8 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -224,7 +224,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       />
     </table-container>
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 817930d..a7b1304 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -149,12 +149,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index f99ddb9..71535b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -136,12 +136,19 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <div v-if="dialogStatus !== 'detail'">
+          <el-button type="primary" @click="saveData">
+            保存
+          </el-button>
+          <el-button @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index decb5d3..6c06b8f 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -54,11 +54,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -195,7 +200,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -221,11 +226,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -262,7 +267,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bbe6c86..06f648c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -68,11 +68,16 @@
     align: 'center',
   },
   {
-    text: '使用部门',
+    text: '使用单位',
     value: 'deptName',
     align: 'center',
   },
   {
+    text: '使用部门',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
     text: '使用岗位',
     value: 'usePosition',
     align: 'center',
@@ -184,7 +189,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
   getUserDept().then((res) => {
@@ -210,11 +215,11 @@
     listQuery.value.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.value.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
@@ -251,7 +256,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 8f82d24..93012a1 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,8 @@
   receiveStatus: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -75,9 +77,14 @@
     value: 'createTime',
     align: 'center',
   },
+  // {
+  //   text: '送检人',
+  //   value: 'deliverer',
+  //   align: 'center',
+  // },
   {
-    text: '送检人',
-    value: 'deliverer',
+    text: '计划送检时间',
+    value: 'requireOverTime',
     align: 'center',
   },
   {
@@ -124,6 +131,8 @@
   listQuery.receiveStatus = ''
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index aeb0919..5aa8c70 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,6 +23,9 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
+  sort: 'desc',
+  orderBy: 'create_time',
+
 })
 const columns = ref([
   {
@@ -143,6 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称
@@ -167,7 +172,7 @@
   // 规格型号
   getModelAllList({}).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
   getDeptList({}).then((res) => {
@@ -193,16 +198,16 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听所在单位，修改部门
 watch(() => listQuery.companyId, (newVal) => {
-  listQuery.deptIds = ''
+  listQuery.deptId = ''
   if (newVal) {
     getDeptTreeList({ pid: newVal }).then((res) => {
       deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
@@ -294,7 +299,7 @@
     <table-container>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index e4067bc..e000159 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -17,6 +17,8 @@
   subSystemId: '', // 分系统
   groupName: '', // 分组名称
   createUserId: userStore.id, // 分组名称
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -97,6 +99,8 @@
   checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index 645d7a4..46a1bb8 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -16,9 +16,10 @@
 // 获取信息变更记录
 const infoList = ref()
 const fetchData = (id: string) => {
-  if (!approvalId.value) { return }
+  // if (!approvalId.value) { return }
   devcieInfoChange({ equipmentId: id }).then((res) => {
-    console.log(res.data, '设备变更记录')
+    // console.log(id, '123123213231213')
+    console.log(res.data, '变更记录1111')
     infoList.value = res.data
   })
 }
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 20986e9..2b0942b 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -176,12 +176,13 @@
 const installLocationList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const usePositionAllList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
   const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
-  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+  modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+  helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   const res1 = await getDictByCode('eqptDeviceUseStatus')
   useStatusList.value = res1.data
   getDictByCode('eqptDeviceLevel').then((res) => {
@@ -205,10 +206,9 @@
     // console.log(res.data, '设备名称')
   })
   // 使用岗位
-  getUserDept().then((res1) => {
-    getPostList({ searchId: $route.path.includes('detail') ? '' : res1.data.id }).then((res) => {
-      usePositionList.value = res.data
-    })
+  getPostList({ }).then((res) => {
+    usePositionList.value = res.data
+    usePositionAllList.value = res.data
   })
   // 安装位置
   getLocationList().then((res) => {
@@ -225,13 +225,13 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
     // console.log(modelList.value, helpList.value)
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -256,10 +256,10 @@
     }
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 设备相关，填充数据
@@ -302,6 +302,24 @@
   deep: true,
   immediate: true,
 })
+// 监听使用部门部门变化修改 使用岗位
+watch(() => ruleForm.value.deptId, (newVal) => {
+  if ($route.path.includes('detail') || isFrist.value) {
+    return
+  }
+  ruleForm.value.usePositionId = ''
+  if (newVal) {
+    getPostList({ searchId: newVal }).then((res) => {
+      usePositionList.value = res.data
+    })
+  }
+  else {
+    usePositionList.value = usePositionAllList.value
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2ae9308..9bd395a 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -77,8 +77,8 @@
   meterIdentify: '', // 计量标识
   checkDateEnd: '',
   checkDateStart: '',
-  sort: '',
-  orderBy: '',
+  sort: 'desc',
+  orderBy: 'create_time',
   manufacturer: '', // 生产厂家
   groupId: '', // 分组
   directorId: '',
@@ -325,7 +325,7 @@
   // 规格型号
   getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -371,11 +371,11 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 监听单位，修改部门
@@ -437,13 +437,13 @@
   listQuery.checkDateEnd = ''
   listQuery.taskId = ''
   listQuery.meterIdentify = ''
-  listQuery.sort = ''
-  listQuery.orderBy = ''
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
   listQuery.manufacturer = ''
   listQuery.groupId = ''
   listQuery.directorId = ''
   checked.value = true
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   if (refresh) {
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
index 91864e1..2edd7d4 100644
--- a/src/views/tested/device/model/components/list.vue
+++ b/src/views/tested/device/model/components/list.vue
@@ -17,6 +17,8 @@
   model: '',
   offset: 1,
   limit: 20,
+  sort: 'desc',
+  orderBy: 'create_time',
 })
 const columns = ref([
   {
@@ -190,8 +192,8 @@
   // 规格型号及辅助字段
   getModelAllList({ equipmentType: '' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
   })
 }
 fetchSelect()
@@ -207,8 +209,8 @@
     })
     getModelAllList({ equipmentType: newVal }).then((res) => {
       allList.value = res.data
-      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
     })
   }
   else {
@@ -218,8 +220,8 @@
     })
     getModelAllList({ equipmentType: '' }).then((res) => {
       allList.value = res.data
-      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
-      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
     })
   }
 }, {
@@ -232,12 +234,12 @@
   if (newVal) {
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(data.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
   else {
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 监听规格型号下拉框，修改辅助字段
@@ -245,13 +247,13 @@
   listQuery.helpInstruction = ''
   if (newVal && listQuery.equipmentName) {
     // 修改规格型号和辅助字段列表
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.equipmentName === listQuery.equipmentName && item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else if (newVal) {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).filter(item => item.model === newVal).map(item => item.helpInstruction))).sort()
   }
   else {
-    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+    helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   }
 })
 // 重置
@@ -261,8 +263,10 @@
   listQuery.equipmentName = ''
   listQuery.helpInstruction = ''
   listQuery.model = ''
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
-  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction)))
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'create_time'
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
+  helpList.value = Array.from(new Set(allList.value.filter(item => item.helpInstruction).map(item => item.helpInstruction))).sort()
   listQuery.offset = 1
   listQuery.limit = 20
   search()
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 4761b98..50d65d9 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -29,6 +29,8 @@
   model: '',
   useSign: '',
   checkStatus: '',
+  sort: 'desc',
+  orderBy: 'certificate_valid',
   offset: 1,
   limit: 20,
 })
@@ -160,6 +162,8 @@
   listQuery.useSign = ''
   listQuery.limit = 20
   listQuery.offset = 1
+  listQuery.sort = 'desc'
+  listQuery.orderBy = 'certificate_valid'
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -252,7 +256,8 @@
 const inUseList = ref<{ id: string; value: string; name: string }[]>()
 const fetchStatusList = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
-    useStatusList.value = res.data
+    const arr = ['在用', '禁用', '延用']
+    useStatusList.value = res.data.filter((item: any) => arr.includes(item.name))
   })
   // 设备名称
   getDeviceNameList({ equipmentType: '1' }).then((res) => {
@@ -261,7 +266,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = res.data.map((item: any) => item.model)
+    modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -312,11 +317,11 @@
     listQuery.model = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.model = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 </script>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index fe17588..4ffb25b 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -112,11 +112,11 @@
     listQuery.equipmentModel = ''
     // 修改规格型号和辅助字段列表
     const data = allList.value.filter(item => item.equipmentName === newVal)
-    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model))).sort()
   }
   else {
     listQuery.equipmentModel = ''
-    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   }
 })
 // 获取数据
@@ -156,7 +156,7 @@
   listQuery.checkDateStart = ''
   listQuery.offset = 1
   listQuery.limit = 20
-  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
+  modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model))).sort()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -305,7 +305,7 @@
   // 规格型号
   getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
 }
 fetchDict()