diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 7296946..63b6ba0 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -115,7 +115,14 @@
     detailApply(data.id).then((res) => {
       ruleForm.value = res.data
       ruleForm.value.isOnSiteCheck = String(ruleForm.value.isOnSiteCheck)
+      ruleForm.value.isUrgent = String(ruleForm.value.isUrgent)
       processId.value = res.data.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
     })
   }
 }
@@ -159,13 +166,21 @@
         ).then((res) => {
           disabledSave.value = true
           ruleForm.value.equipmentList = tableRef.value.list
+
           if (submitId.value) {
             ruleForm.value.id = submitId.value
           }
           if (isAdmin.value) {
             ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
           }
-          editApply(ruleForm.value).then((res) => {
+          const data = { ...ruleForm.value }
+          if (ruleForm.value.isOnSiteCheck === '1') {
+            data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+          }
+          else {
+            data.onSiteCheckTime = ''
+          }
+          editApply(data).then((res) => {
             const submit = (id: string) => {
               submitApply({ id, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => {
                 ElMessage.success('已提交')
@@ -407,8 +422,11 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" class="normal-date" style="width: 100%;"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
                   />
                 </el-form-item>
               </el-col>

diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 7296946..63b6ba0 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -115,7 +115,14 @@
     detailApply(data.id).then((res) => {
       ruleForm.value = res.data
       ruleForm.value.isOnSiteCheck = String(ruleForm.value.isOnSiteCheck)
+      ruleForm.value.isUrgent = String(ruleForm.value.isUrgent)
       processId.value = res.data.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
     })
   }
 }
@@ -159,13 +166,21 @@
         ).then((res) => {
           disabledSave.value = true
           ruleForm.value.equipmentList = tableRef.value.list
+
           if (submitId.value) {
             ruleForm.value.id = submitId.value
           }
           if (isAdmin.value) {
             ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
           }
-          editApply(ruleForm.value).then((res) => {
+          const data = { ...ruleForm.value }
+          if (ruleForm.value.isOnSiteCheck === '1') {
+            data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+          }
+          else {
+            data.onSiteCheckTime = ''
+          }
+          editApply(data).then((res) => {
             const submit = (id: string) => {
               submitApply({ id, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => {
                 ElMessage.success('已提交')
@@ -407,8 +422,11 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" class="normal-date" style="width: 100%;"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
                   />
                 </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 4fbd6c8..1c5f041 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -79,6 +79,7 @@
   undertakerName: [{ required: true, message: '承接人必填', trigger: ['blur', 'change'] }],
   undertakeTime: [{ required: true, message: '承接时间必选', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
+  onSiteCheckTime: [{ required: true, message: '现场检定时间必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const processId = ref()
@@ -122,6 +123,12 @@
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
       processId.value = ruleForm.value.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
       setTimeout(() => {
         isFirst.value = false
       })
@@ -308,8 +315,17 @@
     ruleForm.value.id = submitId.value
   }
   ruleForm.value.customerSampleInfoList = tableRef.value.list
-  ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
-  updateTask(ruleForm.value).then((res) => {
+  if (isAdmin.value) {
+    ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
+  }
+  const data = { ...JSON.parse(JSON.stringify(ruleForm.value)) }
+  if (ruleForm.value.isOnSiteCheck === '1') {
+    data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+  }
+  else {
+    data.onSiteCheckTime = ''
+  }
+  updateTask(data).then((res) => {
     submitId.value = res.data
     // close()
     if (statusName === '已取消' || statusName === '未通过') {
@@ -335,7 +351,7 @@
           },
         ).then((_res) => {
           valiateTask(ruleForm.value).then((res) => {
-            // 调用提示信息
+          // 调用提示信息
             if (res.data) {
               ElMessageBox.confirm(
         `${res.data}`,
@@ -522,8 +538,10 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间" class="normal-date" style="width: 100%;"
                   />
                 </el-form-item>
               </el-col>
@@ -557,14 +575,16 @@
           </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
             <el-col :span="6">
               <el-form-item label="电话" prop="customerPhone">
                 <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />

diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 7296946..63b6ba0 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -115,7 +115,14 @@
     detailApply(data.id).then((res) => {
       ruleForm.value = res.data
       ruleForm.value.isOnSiteCheck = String(ruleForm.value.isOnSiteCheck)
+      ruleForm.value.isUrgent = String(ruleForm.value.isUrgent)
       processId.value = res.data.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
     })
   }
 }
@@ -159,13 +166,21 @@
         ).then((res) => {
           disabledSave.value = true
           ruleForm.value.equipmentList = tableRef.value.list
+
           if (submitId.value) {
             ruleForm.value.id = submitId.value
           }
           if (isAdmin.value) {
             ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
           }
-          editApply(ruleForm.value).then((res) => {
+          const data = { ...ruleForm.value }
+          if (ruleForm.value.isOnSiteCheck === '1') {
+            data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+          }
+          else {
+            data.onSiteCheckTime = ''
+          }
+          editApply(data).then((res) => {
             const submit = (id: string) => {
               submitApply({ id, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => {
                 ElMessage.success('已提交')
@@ -407,8 +422,11 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" class="normal-date" style="width: 100%;"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
                   />
                 </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 4fbd6c8..1c5f041 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -79,6 +79,7 @@
   undertakerName: [{ required: true, message: '承接人必填', trigger: ['blur', 'change'] }],
   undertakeTime: [{ required: true, message: '承接时间必选', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
+  onSiteCheckTime: [{ required: true, message: '现场检定时间必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const processId = ref()
@@ -122,6 +123,12 @@
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
       processId.value = ruleForm.value.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
       setTimeout(() => {
         isFirst.value = false
       })
@@ -308,8 +315,17 @@
     ruleForm.value.id = submitId.value
   }
   ruleForm.value.customerSampleInfoList = tableRef.value.list
-  ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
-  updateTask(ruleForm.value).then((res) => {
+  if (isAdmin.value) {
+    ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
+  }
+  const data = { ...JSON.parse(JSON.stringify(ruleForm.value)) }
+  if (ruleForm.value.isOnSiteCheck === '1') {
+    data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+  }
+  else {
+    data.onSiteCheckTime = ''
+  }
+  updateTask(data).then((res) => {
     submitId.value = res.data
     // close()
     if (statusName === '已取消' || statusName === '未通过') {
@@ -335,7 +351,7 @@
           },
         ).then((_res) => {
           valiateTask(ruleForm.value).then((res) => {
-            // 调用提示信息
+          // 调用提示信息
             if (res.data) {
               ElMessageBox.confirm(
         `${res.data}`,
@@ -522,8 +538,10 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间" class="normal-date" style="width: 100%;"
                   />
                 </el-form-item>
               </el-col>
@@ -557,14 +575,16 @@
           </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
             <el-col :span="6">
               <el-form-item label="电话" prop="customerPhone">
                 <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 5e6ca2d..b3b7bcc 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -504,8 +504,8 @@
       <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 :style="{ color: TextColor(scope.row.receiveStatusName) }">
+              {{ scope.row.receiveStatusName }}
             </span>
           </template>
         </el-table-column>

diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 7296946..63b6ba0 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -115,7 +115,14 @@
     detailApply(data.id).then((res) => {
       ruleForm.value = res.data
       ruleForm.value.isOnSiteCheck = String(ruleForm.value.isOnSiteCheck)
+      ruleForm.value.isUrgent = String(ruleForm.value.isUrgent)
       processId.value = res.data.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
     })
   }
 }
@@ -159,13 +166,21 @@
         ).then((res) => {
           disabledSave.value = true
           ruleForm.value.equipmentList = tableRef.value.list
+
           if (submitId.value) {
             ruleForm.value.id = submitId.value
           }
           if (isAdmin.value) {
             ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
           }
-          editApply(ruleForm.value).then((res) => {
+          const data = { ...ruleForm.value }
+          if (ruleForm.value.isOnSiteCheck === '1') {
+            data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+          }
+          else {
+            data.onSiteCheckTime = ''
+          }
+          editApply(data).then((res) => {
             const submit = (id: string) => {
               submitApply({ id, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => {
                 ElMessage.success('已提交')
@@ -407,8 +422,11 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" class="normal-date" style="width: 100%;"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
                   />
                 </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 4fbd6c8..1c5f041 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -79,6 +79,7 @@
   undertakerName: [{ required: true, message: '承接人必填', trigger: ['blur', 'change'] }],
   undertakeTime: [{ required: true, message: '承接时间必选', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
+  onSiteCheckTime: [{ required: true, message: '现场检定时间必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const processId = ref()
@@ -122,6 +123,12 @@
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
       processId.value = ruleForm.value.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
       setTimeout(() => {
         isFirst.value = false
       })
@@ -308,8 +315,17 @@
     ruleForm.value.id = submitId.value
   }
   ruleForm.value.customerSampleInfoList = tableRef.value.list
-  ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
-  updateTask(ruleForm.value).then((res) => {
+  if (isAdmin.value) {
+    ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
+  }
+  const data = { ...JSON.parse(JSON.stringify(ruleForm.value)) }
+  if (ruleForm.value.isOnSiteCheck === '1') {
+    data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+  }
+  else {
+    data.onSiteCheckTime = ''
+  }
+  updateTask(data).then((res) => {
     submitId.value = res.data
     // close()
     if (statusName === '已取消' || statusName === '未通过') {
@@ -335,7 +351,7 @@
           },
         ).then((_res) => {
           valiateTask(ruleForm.value).then((res) => {
-            // 调用提示信息
+          // 调用提示信息
             if (res.data) {
               ElMessageBox.confirm(
         `${res.data}`,
@@ -522,8 +538,10 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间" class="normal-date" style="width: 100%;"
                   />
                 </el-form-item>
               </el-col>
@@ -557,14 +575,16 @@
           </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
             <el-col :span="6">
               <el-form-item label="电话" prop="customerPhone">
                 <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 5e6ca2d..b3b7bcc 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -504,8 +504,8 @@
       <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 :style="{ color: TextColor(scope.row.receiveStatusName) }">
+              {{ scope.row.receiveStatusName }}
             </span>
           </template>
         </el-table-column>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 8fa6d8d..163fb95 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -594,6 +594,7 @@
         if (submitId.value !== '未提交' && submitId.value !== '') {
           ruleForm.value.id = submitId.value
         }
+        ruleForm.value.installLocation = ruleForm.value.installLocationId ? installLocationList.value.filter((item: any) => item.id === ruleForm.value.installLocationId)[0].installLocation : ''
         // 正常流程
         editInfo(ruleForm.value).then((res) => {
           submitId.value = res.data

diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 7296946..63b6ba0 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -115,7 +115,14 @@
     detailApply(data.id).then((res) => {
       ruleForm.value = res.data
       ruleForm.value.isOnSiteCheck = String(ruleForm.value.isOnSiteCheck)
+      ruleForm.value.isUrgent = String(ruleForm.value.isUrgent)
       processId.value = res.data.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
     })
   }
 }
@@ -159,13 +166,21 @@
         ).then((res) => {
           disabledSave.value = true
           ruleForm.value.equipmentList = tableRef.value.list
+
           if (submitId.value) {
             ruleForm.value.id = submitId.value
           }
           if (isAdmin.value) {
             ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
           }
-          editApply(ruleForm.value).then((res) => {
+          const data = { ...ruleForm.value }
+          if (ruleForm.value.isOnSiteCheck === '1') {
+            data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+          }
+          else {
+            data.onSiteCheckTime = ''
+          }
+          editApply(data).then((res) => {
             const submit = (id: string) => {
               submitApply({ id, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => {
                 ElMessage.success('已提交')
@@ -407,8 +422,11 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" class="normal-date" style="width: 100%;"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
                   />
                 </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 4fbd6c8..1c5f041 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -79,6 +79,7 @@
   undertakerName: [{ required: true, message: '承接人必填', trigger: ['blur', 'change'] }],
   undertakeTime: [{ required: true, message: '承接时间必选', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
+  onSiteCheckTime: [{ required: true, message: '现场检定时间必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const processId = ref()
@@ -122,6 +123,12 @@
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
       processId.value = ruleForm.value.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
       setTimeout(() => {
         isFirst.value = false
       })
@@ -308,8 +315,17 @@
     ruleForm.value.id = submitId.value
   }
   ruleForm.value.customerSampleInfoList = tableRef.value.list
-  ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
-  updateTask(ruleForm.value).then((res) => {
+  if (isAdmin.value) {
+    ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
+  }
+  const data = { ...JSON.parse(JSON.stringify(ruleForm.value)) }
+  if (ruleForm.value.isOnSiteCheck === '1') {
+    data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+  }
+  else {
+    data.onSiteCheckTime = ''
+  }
+  updateTask(data).then((res) => {
     submitId.value = res.data
     // close()
     if (statusName === '已取消' || statusName === '未通过') {
@@ -335,7 +351,7 @@
           },
         ).then((_res) => {
           valiateTask(ruleForm.value).then((res) => {
-            // 调用提示信息
+          // 调用提示信息
             if (res.data) {
               ElMessageBox.confirm(
         `${res.data}`,
@@ -522,8 +538,10 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间" class="normal-date" style="width: 100%;"
                   />
                 </el-form-item>
               </el-col>
@@ -557,14 +575,16 @@
           </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
             <el-col :span="6">
               <el-form-item label="电话" prop="customerPhone">
                 <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 5e6ca2d..b3b7bcc 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -504,8 +504,8 @@
       <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 :style="{ color: TextColor(scope.row.receiveStatusName) }">
+              {{ scope.row.receiveStatusName }}
             </span>
           </template>
         </el-table-column>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 8fa6d8d..163fb95 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -594,6 +594,7 @@
         if (submitId.value !== '未提交' && submitId.value !== '') {
           ruleForm.value.id = submitId.value
         }
+        ruleForm.value.installLocation = ruleForm.value.installLocationId ? installLocationList.value.filter((item: any) => item.id === ruleForm.value.installLocationId)[0].installLocation : ''
         // 正常流程
         editInfo(ruleForm.value).then((res) => {
           submitId.value = res.data
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 6f94889..5962f7d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -1413,8 +1413,7 @@
   <!-- 扫描 -->
   <scan-equipment-dialog ref="scanEquipmentRef" title="扫描查询设备" />
   <!-- 标签打印组件 -->
-  <!-- :class="{ 'hidden-page': hidden }" -->
-  <div id="printDiv" ref="printDiv">
+  <div id="printDiv" ref="printDiv" :class="{ 'hidden-page': hidden }">
     <print-tag v-for="item of selectList" :key="item" :data="item" />
   </div>
 </template>

diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 7296946..63b6ba0 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -115,7 +115,14 @@
     detailApply(data.id).then((res) => {
       ruleForm.value = res.data
       ruleForm.value.isOnSiteCheck = String(ruleForm.value.isOnSiteCheck)
+      ruleForm.value.isUrgent = String(ruleForm.value.isUrgent)
       processId.value = res.data.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
     })
   }
 }
@@ -159,13 +166,21 @@
         ).then((res) => {
           disabledSave.value = true
           ruleForm.value.equipmentList = tableRef.value.list
+
           if (submitId.value) {
             ruleForm.value.id = submitId.value
           }
           if (isAdmin.value) {
             ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
           }
-          editApply(ruleForm.value).then((res) => {
+          const data = { ...ruleForm.value }
+          if (ruleForm.value.isOnSiteCheck === '1') {
+            data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+          }
+          else {
+            data.onSiteCheckTime = ''
+          }
+          editApply(data).then((res) => {
             const submit = (id: string) => {
               submitApply({ id, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => {
                 ElMessage.success('已提交')
@@ -407,8 +422,11 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" class="normal-date" style="width: 100%;"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
                   />
                 </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 4fbd6c8..1c5f041 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -79,6 +79,7 @@
   undertakerName: [{ required: true, message: '承接人必填', trigger: ['blur', 'change'] }],
   undertakeTime: [{ required: true, message: '承接时间必选', trigger: ['blur', 'change'] }],
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
+  onSiteCheckTime: [{ required: true, message: '现场检定时间必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const processId = ref()
@@ -122,6 +123,12 @@
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
       processId.value = ruleForm.value.processId
+      if (ruleForm.value.isOnSiteCheck === '1') {
+        ruleForm.value.onSiteCheckTime = ruleForm.value.onSiteCheckTime.split(',')
+      }
+      else {
+        ruleForm.value.onSiteCheckTime = ''
+      }
       setTimeout(() => {
         isFirst.value = false
       })
@@ -308,8 +315,17 @@
     ruleForm.value.id = submitId.value
   }
   ruleForm.value.customerSampleInfoList = tableRef.value.list
-  ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
-  updateTask(ruleForm.value).then((res) => {
+  if (isAdmin.value) {
+    ruleForm.value.customerName = companyList.value.filter(item => item.id === ruleForm.value.customerId)[0]?.name
+  }
+  const data = { ...JSON.parse(JSON.stringify(ruleForm.value)) }
+  if (ruleForm.value.isOnSiteCheck === '1') {
+    data.onSiteCheckTime = ruleForm.value.onSiteCheckTime.join(',')
+  }
+  else {
+    data.onSiteCheckTime = ''
+  }
+  updateTask(data).then((res) => {
     submitId.value = res.data
     // close()
     if (statusName === '已取消' || statusName === '未通过') {
@@ -335,7 +351,7 @@
           },
         ).then((_res) => {
           valiateTask(ruleForm.value).then((res) => {
-            // 调用提示信息
+          // 调用提示信息
             if (res.data) {
               ElMessageBox.confirm(
         `${res.data}`,
@@ -522,8 +538,10 @@
               <el-col :span="6">
                 <el-form-item label="现场检定时间" prop="onSiteCheckTime">
                   <el-date-picker
-                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                    v-model="ruleForm.onSiteCheckTime" type="daterange" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间" class="normal-date" style="width: 100%;"
                   />
                 </el-form-item>
               </el-col>
@@ -557,14 +575,16 @@
           </el-col> -->
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
             <el-col :span="6">
               <el-form-item label="电话" prop="customerPhone">
                 <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 5e6ca2d..b3b7bcc 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -504,8 +504,8 @@
       <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 :style="{ color: TextColor(scope.row.receiveStatusName) }">
+              {{ scope.row.receiveStatusName }}
             </span>
           </template>
         </el-table-column>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 8fa6d8d..163fb95 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -594,6 +594,7 @@
         if (submitId.value !== '未提交' && submitId.value !== '') {
           ruleForm.value.id = submitId.value
         }
+        ruleForm.value.installLocation = ruleForm.value.installLocationId ? installLocationList.value.filter((item: any) => item.id === ruleForm.value.installLocationId)[0].installLocation : ''
         // 正常流程
         editInfo(ruleForm.value).then((res) => {
           submitId.value = res.data
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 6f94889..5962f7d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -1413,8 +1413,7 @@
   <!-- 扫描 -->
   <scan-equipment-dialog ref="scanEquipmentRef" title="扫描查询设备" />
   <!-- 标签打印组件 -->
-  <!-- :class="{ 'hidden-page': hidden }" -->
-  <div id="printDiv" ref="printDiv">
+  <div id="printDiv" ref="printDiv" :class="{ 'hidden-page': hidden }">
     <print-tag v-for="item of selectList" :key="item" :data="item" />
   </div>
 </template>
diff --git a/src/views/tested/device/info/components/printTag.vue b/src/views/tested/device/info/components/printTag.vue
index 97b0543..6950461 100644
--- a/src/views/tested/device/info/components/printTag.vue
+++ b/src/views/tested/device/info/components/printTag.vue
@@ -78,7 +78,7 @@
   // transform: scaleY(0.96);
   overflow: hidden;
   box-sizing: content-box;
-  border-top: 2mm solid transparent;
+  border-top: 3mm solid transparent;
 
   .left-info {
     // height: 55mm;