diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 57fbea6..9c2f2d9 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -263,6 +263,7 @@
     ruleForm.value.id = submitId.value
   }
   ruleForm.value.customerSampleInfoList = tableRef.value.list
+  ruleForm.value.customerName = ruleForm.value.customerName ? ruleForm.value.customerName : companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
   updateTask(ruleForm.value).then((res) => {
     submitId.value = res.data
     // close()
@@ -358,7 +359,7 @@
     <!-- 审批弹窗 -->
     <!-- <approval-dialog ref="approvalDialogRef" @on-success="search" /> -->
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
-    <detail-page :title="`外送申请单-${textMap[dialogStatus]}`">
+    <detail-page :title="`任务单-${textMap[dialogStatus]}`">
       <!-- <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
@@ -548,7 +549,7 @@
           </el-row>
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="接收状态">
+              <el-form-item label="任务单状态">
                 <el-input v-model.trim="ruleForm.receiveStatusName" />
               </el-form-item>
             </el-col>

diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 57fbea6..9c2f2d9 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -263,6 +263,7 @@
     ruleForm.value.id = submitId.value
   }
   ruleForm.value.customerSampleInfoList = tableRef.value.list
+  ruleForm.value.customerName = ruleForm.value.customerName ? ruleForm.value.customerName : companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
   updateTask(ruleForm.value).then((res) => {
     submitId.value = res.data
     // close()
@@ -358,7 +359,7 @@
     <!-- 审批弹窗 -->
     <!-- <approval-dialog ref="approvalDialogRef" @on-success="search" /> -->
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
-    <detail-page :title="`外送申请单-${textMap[dialogStatus]}`">
+    <detail-page :title="`任务单-${textMap[dialogStatus]}`">
       <!-- <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
@@ -548,7 +549,7 @@
           </el-row>
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="接收状态">
+              <el-form-item label="任务单状态">
                 <el-input v-model.trim="ruleForm.receiveStatusName" />
               </el-form-item>
             </el-col>
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index fd1924c..c81fd92 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,7 +1,9 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
+import dayjs from 'dayjs'
 import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { StringValueToken } from 'html2canvas/dist/types/css/syntax/tokenizer'
 import ApprovalDialog from './ApprovalDialog.vue'
 import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
@@ -10,6 +12,7 @@
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -36,6 +39,9 @@
   formId: SCHEDULE.METERING_TASK_APPROVAL,
   approvalStatus: '',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'TaskPage')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -125,7 +131,7 @@
     listQuery.offset = 1
   }
   getListPage(listQuery, $props.statusName).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => ({ ...item, requireOverTime: dayjs(item.requireOverTime).format('YYYY-MM-DD') }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
@@ -340,6 +346,32 @@
     })
   })
 }
+const TextColor = computed(() => {
+  return (name: string) => {
+    let color = ''
+    switch (name) {
+      case '未接收':
+        color = '#888'
+        break
+      case '已接收':
+        color = '#000'
+        break
+      case '已取消':
+        color = '#EAA341'
+        break
+      case '已退回':
+        color = '#F68787'
+        break
+      case '检测完成':
+        color = '#82CD5E'
+        break
+      default:
+        color = '#000'
+        break
+    }
+    return color
+  }
+})
 </script>
 
 <template>
@@ -376,7 +408,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="接收状态" clearable>
+        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -401,9 +433,11 @@
         :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
-          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+          <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
+                {{ scope.row.receiveStatusName }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="140" align="center">

diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 57fbea6..9c2f2d9 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -263,6 +263,7 @@
     ruleForm.value.id = submitId.value
   }
   ruleForm.value.customerSampleInfoList = tableRef.value.list
+  ruleForm.value.customerName = ruleForm.value.customerName ? ruleForm.value.customerName : companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
   updateTask(ruleForm.value).then((res) => {
     submitId.value = res.data
     // close()
@@ -358,7 +359,7 @@
     <!-- 审批弹窗 -->
     <!-- <approval-dialog ref="approvalDialogRef" @on-success="search" /> -->
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
-    <detail-page :title="`外送申请单-${textMap[dialogStatus]}`">
+    <detail-page :title="`任务单-${textMap[dialogStatus]}`">
       <!-- <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
@@ -548,7 +549,7 @@
           </el-row>
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="接收状态">
+              <el-form-item label="任务单状态">
                 <el-input v-model.trim="ruleForm.receiveStatusName" />
               </el-form-item>
             </el-col>
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index fd1924c..c81fd92 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,7 +1,9 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
+import dayjs from 'dayjs'
 import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { StringValueToken } from 'html2canvas/dist/types/css/syntax/tokenizer'
 import ApprovalDialog from './ApprovalDialog.vue'
 import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
@@ -10,6 +12,7 @@
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -36,6 +39,9 @@
   formId: SCHEDULE.METERING_TASK_APPROVAL,
   approvalStatus: '',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'TaskPage')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -125,7 +131,7 @@
     listQuery.offset = 1
   }
   getListPage(listQuery, $props.statusName).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => ({ ...item, requireOverTime: dayjs(item.requireOverTime).format('YYYY-MM-DD') }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
@@ -340,6 +346,32 @@
     })
   })
 }
+const TextColor = computed(() => {
+  return (name: string) => {
+    let color = ''
+    switch (name) {
+      case '未接收':
+        color = '#888'
+        break
+      case '已接收':
+        color = '#000'
+        break
+      case '已取消':
+        color = '#EAA341'
+        break
+      case '已退回':
+        color = '#F68787'
+        break
+      case '检测完成':
+        color = '#82CD5E'
+        break
+      default:
+        color = '#000'
+        break
+    }
+    return color
+  }
+})
 </script>
 
 <template>
@@ -376,7 +408,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="接收状态" clearable>
+        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -401,9 +433,11 @@
         :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
-          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+          <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
+                {{ scope.row.receiveStatusName }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="140" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 60fb839..0bf751f 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -128,24 +128,6 @@
     required: false,
     type: 'text',
   },
-  {
-    text: '接收状态',
-    value: 'sampleStatusName',
-    required: false,
-    type: 'text',
-  },
-  {
-    text: '检定结果',
-    value: 'measureCompletePercent',
-    required: false,
-    itype: 'text',
-  },
-  {
-    text: '检定完成时间',
-    value: 'measureCompleteTime',
-    required: false,
-    type: 'text',
-  },
 ])
 const list = ref<any[]>([])
 // 检查数据列表
@@ -327,6 +309,36 @@
   })
   // })
 }
+
+const TextColor = computed(() => {
+  return (name: string) => {
+    let color = ''
+    switch (name) {
+      case '未接收':
+        color = '#888'
+        break
+      case '已接收':
+        color = '#000'
+        break
+      case '已取消':
+        color = '#EAA341'
+        break
+      case '已退回':
+        color = '#F68787'
+        break
+      case '检测完成':
+        color = '#82CD5E'
+        break
+      case '检定中':
+        color = '#4FA6FF'
+        break
+      default:
+        color = '#000'
+        break
+    }
+    return color
+  }
+})
 </script>
 
 <template>
@@ -400,6 +412,34 @@
           <!-- </span> -->
         </template>
       </el-table-column>
+      <template v-if="$route.path.includes('detail') && $route.query.statusName === '全部'">
+        <el-table-column align="center" label="接收状态">
+          <template #default="scope">
+            <span :style="{ color: TextColor(scope.row.sampleStatusName) }">
+              {{ scope.row.sampleStatusName }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="检定结果">
+          <template #default="scope">
+            <el-tag
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
+                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              "
+            >
+              {{ scope.row.measureCompletePercent }}
+            </el-tag>
+            <span v-else :style="{ color: TextColor(scope.row.measureCompletePercent) }">
+              {{ scope.row.measureCompletePercent }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="检定完成时间">
+          <template #default="scope">
+            {{ scope.row.measureCompleteTime }}
+          </template>
+        </el-table-column>
+      </template>
     </el-table>
   </detail-block-switch>
 </template>

diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 57fbea6..9c2f2d9 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -263,6 +263,7 @@
     ruleForm.value.id = submitId.value
   }
   ruleForm.value.customerSampleInfoList = tableRef.value.list
+  ruleForm.value.customerName = ruleForm.value.customerName ? ruleForm.value.customerName : companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
   updateTask(ruleForm.value).then((res) => {
     submitId.value = res.data
     // close()
@@ -358,7 +359,7 @@
     <!-- 审批弹窗 -->
     <!-- <approval-dialog ref="approvalDialogRef" @on-success="search" /> -->
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
-    <detail-page :title="`外送申请单-${textMap[dialogStatus]}`">
+    <detail-page :title="`任务单-${textMap[dialogStatus]}`">
       <!-- <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
@@ -548,7 +549,7 @@
           </el-row>
           <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="接收状态">
+              <el-form-item label="任务单状态">
                 <el-input v-model.trim="ruleForm.receiveStatusName" />
               </el-form-item>
             </el-col>
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index fd1924c..c81fd92 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,7 +1,9 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
+import dayjs from 'dayjs'
 import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { StringValueToken } from 'html2canvas/dist/types/css/syntax/tokenizer'
 import ApprovalDialog from './ApprovalDialog.vue'
 import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
@@ -10,6 +12,7 @@
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { keepSearchParams } from '@/utils/keepQuery'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -36,6 +39,9 @@
   formId: SCHEDULE.METERING_TASK_APPROVAL,
   approvalStatus: '',
 })
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'TaskPage')
+})
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -125,7 +131,7 @@
     listQuery.offset = 1
   }
   getListPage(listQuery, $props.statusName).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => ({ ...item, requireOverTime: dayjs(item.requireOverTime).format('YYYY-MM-DD') }))
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
@@ -340,6 +346,32 @@
     })
   })
 }
+const TextColor = computed(() => {
+  return (name: string) => {
+    let color = ''
+    switch (name) {
+      case '未接收':
+        color = '#888'
+        break
+      case '已接收':
+        color = '#000'
+        break
+      case '已取消':
+        color = '#EAA341'
+        break
+      case '已退回':
+        color = '#F68787'
+        break
+      case '检测完成':
+        color = '#82CD5E'
+        break
+      default:
+        color = '#000'
+        break
+    }
+    return color
+  }
+})
 </script>
 
 <template>
@@ -376,7 +408,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="设备出厂编号" clearable />
       </search-item>
       <search-item v-if="$props.statusName === '全部'">
-        <el-select v-model="listQuery.receiveStatus" placeholder="接收状态" clearable>
+        <el-select v-model="listQuery.receiveStatus" placeholder="任务单状态" clearable>
           <el-option v-for="item in receiveStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -401,9 +433,11 @@
         :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
-          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+          <el-table-column v-if="$props.statusName === '全部'" label="任务单状态" align="center">
             <template #default="scope">
-              {{ scope.row.receiveStatusName }}
+              <span :style="{ color: TextColor(scope.row.receiveStatusName) }">
+                {{ scope.row.receiveStatusName }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="140" align="center">
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 60fb839..0bf751f 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -128,24 +128,6 @@
     required: false,
     type: 'text',
   },
-  {
-    text: '接收状态',
-    value: 'sampleStatusName',
-    required: false,
-    type: 'text',
-  },
-  {
-    text: '检定结果',
-    value: 'measureCompletePercent',
-    required: false,
-    itype: 'text',
-  },
-  {
-    text: '检定完成时间',
-    value: 'measureCompleteTime',
-    required: false,
-    type: 'text',
-  },
 ])
 const list = ref<any[]>([])
 // 检查数据列表
@@ -327,6 +309,36 @@
   })
   // })
 }
+
+const TextColor = computed(() => {
+  return (name: string) => {
+    let color = ''
+    switch (name) {
+      case '未接收':
+        color = '#888'
+        break
+      case '已接收':
+        color = '#000'
+        break
+      case '已取消':
+        color = '#EAA341'
+        break
+      case '已退回':
+        color = '#F68787'
+        break
+      case '检测完成':
+        color = '#82CD5E'
+        break
+      case '检定中':
+        color = '#4FA6FF'
+        break
+      default:
+        color = '#000'
+        break
+    }
+    return color
+  }
+})
 </script>
 
 <template>
@@ -400,6 +412,34 @@
           <!-- </span> -->
         </template>
       </el-table-column>
+      <template v-if="$route.path.includes('detail') && $route.query.statusName === '全部'">
+        <el-table-column align="center" label="接收状态">
+          <template #default="scope">
+            <span :style="{ color: TextColor(scope.row.sampleStatusName) }">
+              {{ scope.row.sampleStatusName }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="检定结果">
+          <template #default="scope">
+            <el-tag
+              v-if="['合格', '不合格', '限用'].includes(scope.row.measureCompletePercent)" :type="
+                scope.row.measureCompletePercent === '合格' ? 'success' : scope.row.measureCompletePercent === '不合格' ? 'danger' : scope.row.measureCompletePercent === '限用' ? 'warning' : 'primary'
+              "
+            >
+              {{ scope.row.measureCompletePercent }}
+            </el-tag>
+            <span v-else :style="{ color: TextColor(scope.row.measureCompletePercent) }">
+              {{ scope.row.measureCompletePercent }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="检定完成时间">
+          <template #default="scope">
+            {{ scope.row.measureCompleteTime }}
+          </template>
+        </el-table-column>
+      </template>
     </el-table>
   </detail-block-switch>
 </template>
diff --git a/src/views/tested/subpackage/task/components/edit.vue b/src/views/tested/subpackage/task/components/edit.vue
index 076c895..2f6cf00 100644
--- a/src/views/tested/subpackage/task/components/edit.vue
+++ b/src/views/tested/subpackage/task/components/edit.vue
@@ -314,7 +314,7 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <!-- 分包方弹窗 -->
     <subpackage-dialog ref="subpackageRef" @add="confirm" />
-    <detail-page class="base-info-device" :title="`外送任务单-${textMap[dialogStatus]}`">
+    <detail-page class="base-info-device" :title="`外送申请单-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.agree)" type="primary" @click="apply('agree')">
           同意