diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 8110a5b..fea4bc4 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -336,13 +336,13 @@
         color = '#40AAFF'
         break
       case '已检完':
-        color = '#F0F9EB'
+        color = '#1afa29'
         break
       case '未检定':
         color = '#000'
         break
       case '已接收':
-        color = '#F0F9EB'
+        color = '#1afa29'
         break
       case '未接收':
         color = '#000'

diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 8110a5b..fea4bc4 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -336,13 +336,13 @@
         color = '#40AAFF'
         break
       case '已检完':
-        color = '#F0F9EB'
+        color = '#1afa29'
         break
       case '未检定':
         color = '#000'
         break
       case '已接收':
-        color = '#F0F9EB'
+        color = '#1afa29'
         break
       case '未接收':
         color = '#000'
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d6770bf..8b96b76 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -997,15 +997,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="检定去向" prop="checkDestination">
-                <el-select v-model="ruleForm.checkDestination" placeholder="检定去向" style="width: 100%;">
-                  <!-- <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" /> -->
-                  <el-option label="计量室" value="1" />
-                  <el-option label="外送" value="2" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="统一编号">
                 <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
               </el-form-item>
@@ -1127,6 +1118,15 @@
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
+              <el-form-item label="检定去向" prop="checkDestination">
+                <el-select v-model="ruleForm.checkDestination" placeholder="检定去向" style="width: 100%;">
+                  <!-- <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" /> -->
+                  <el-option label="计量室" value="1" />
+                  <el-option label="外送" value="2" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocationId">
                 <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
                 <el-select v-model="ruleForm.installLocationId" filterable placeholder="安装位置" clearable style="width: 100%;">

diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 8110a5b..fea4bc4 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -336,13 +336,13 @@
         color = '#40AAFF'
         break
       case '已检完':
-        color = '#F0F9EB'
+        color = '#1afa29'
         break
       case '未检定':
         color = '#000'
         break
       case '已接收':
-        color = '#F0F9EB'
+        color = '#1afa29'
         break
       case '未接收':
         color = '#000'
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d6770bf..8b96b76 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -997,15 +997,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="检定去向" prop="checkDestination">
-                <el-select v-model="ruleForm.checkDestination" placeholder="检定去向" style="width: 100%;">
-                  <!-- <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" /> -->
-                  <el-option label="计量室" value="1" />
-                  <el-option label="外送" value="2" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="统一编号">
                 <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
               </el-form-item>
@@ -1127,6 +1118,15 @@
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
+              <el-form-item label="检定去向" prop="checkDestination">
+                <el-select v-model="ruleForm.checkDestination" placeholder="检定去向" style="width: 100%;">
+                  <!-- <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" /> -->
+                  <el-option label="计量室" value="1" />
+                  <el-option label="外送" value="2" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocationId">
                 <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
                 <el-select v-model="ruleForm.installLocationId" filterable placeholder="安装位置" clearable style="width: 100%;">
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 81d70b9..506249b 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -31,7 +31,7 @@
   tastEndTime: '',
   taskStartTime: '',
   checkDestination: '', // 鉴定去向
-  deptId: '',
+  deptIds: '',
   taskId: '',
   model: '',
   useSign: '',
@@ -183,7 +183,7 @@
   listQuery.usageStatus = ''
   listQuery.model = ''
   listQuery.taskId = ''
-  listQuery.deptId = ''
+  listQuery.deptIds = ''
   listQuery.checkStatus = ''
   listQuery.checkDestination = ''
   listQuery.useSign = ''
@@ -308,17 +308,20 @@
     remindList.value = res.data
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    // getDeptTree({ pid: '0' }).then((res1) => {
-    //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // })
-    // getUserDeptSon({ }).then((res) => {
-    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    //   console.log(deptList.value, 'deptList.value')
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
-    })
+  getDeptTreeList({ pid: '0' }).then((res1) => {
+    deptList.value = toTreeList(res1.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
   })
+  // getUserDept().then((res) => {
+  //   // getDeptTree({ pid: '0' }).then((res1) => {
+  //   //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // })
+  //   // getUserDeptSon({ }).then((res) => {
+  //   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   //   console.log(deptList.value, 'deptList.value')
+  //   // getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //   //   deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+  //   // })
+  // })
 
   // })
   // 使用岗位