增加显示

yudao-ui-admin-vue3/src/views/pressure2/equipboilerscheduling/components/BoilerPlanScheduleDialog.vue

@@ -131,6 +131,7 @@
               <span>外部检验</span>
               <span class="section-info">
                 待检设备数量: {{ outEquipCount }} &nbsp;&nbsp; 最近临期时间: {{ outLatestTime }}
+                <template v-if="isSameYear(inLatestTime, outLatestTime)">&nbsp;&nbsp; 内检临期时间: {{ inLatestTime }}</template>
               </span>
             </div>
             <el-form-item label="外检日期" prop="outDate">
@@ -225,6 +226,8 @@
               <span>耐压检验</span>
               <span class="section-info">
                 待检设备数量: {{ preEquipCount }} &nbsp;&nbsp; 最近临期时间: {{ preLatestTime }}
+                <template v-if="isSameYear(inLatestTime, preLatestTime)">&nbsp;&nbsp; 内检临期时间: {{ inLatestTime }}</template>
+                <template v-if="isSameYear(outLatestTime, preLatestTime)">&nbsp;&nbsp; 外检临期时间: {{ outLatestTime }}</template>
               </span>
             </div>
             <el-form-item label="耐压检验日期" prop="preDate">
@@ -541,6 +544,12 @@ const preLatestTime = computed(() => {
   return latestTime ? dayjs(latestTime).format('YYYY-MM-DD') : '无'
 })
 
+/** 判断两个临检时间是否同一年 */
+const isSameYear = (time1: string, time2: string) => {
+  if (time1 === '无' || time2 === '无') return false
+  return time1.substring(0, 4) === time2.substring(0, 4)
+}
+
 const formData = ref({
   checkType: '100',
   // 内部检验