From 55321e5dc5079ba0727d5a936f1736e0f2a6001e Mon Sep 17 00:00:00 2001
From: zhoulinf <2507241354@qq.com>
Date: Thu, 27 Nov 2025 14:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=A4=87--=E4=BF=AE=E6=94=B9--?=
 =?UTF-8?q?=E6=8D=A2=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/reportIndex.vue | 50 ++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/views/report/reportIndex.vue b/src/views/report/reportIndex.vue
index 283f8e12..cf830d8c 100644
--- a/src/views/report/reportIndex.vue
+++ b/src/views/report/reportIndex.vue
@@ -57,7 +57,7 @@
         </div>
       </div>
       <report-list-item :report-list.sync="reportList" @getReport="getReportHandler" />
-      <van-popup ref="addReportModal" v-model="addReportShow" :close-on-click-overlay="false" closeable duration="0" round position="bottom">
+      <van-popup ref="addReportModal" v-model="addReportShow" :close-on-click-overlay="false" z-index="500" closeable duration="0" round position="bottom">
         <div class="dialog_wrap">
           <img class="add_report_bg" src="@/assets/report/add_report_bg.png" alt="">
           <div class="report_content">
@@ -67,13 +67,26 @@
                 <img class="dot" src="@/assets/report/add_report_dot.png" alt="">
                 <span>预约时间</span>
               </div>
-              <div class="report_time_content" @click="showDatetime = true">
+              <el-date-picker class="report_time_content owner_time high-zindex-picker"
+                              v-model="appointTime"
+                              type="datetime"
+                              :picker-options="pickerOptions"
+                              :minutes-step="5"
+                              format="yyyy-MM-dd HH:mm:00"
+                              placeholder="选择日期时间">
+              </el-date-picker>
+              <!--<el-date-picker
+                v-model="appointTime"
+                type="datetime"
+                placeholder="选择日期时间">
+              </el-date-picker>-->
+              <!--<div class="report_time_content" @click="showDatetime = true">
                 <div class="report_time_left">
                   <img class="add_report_time" src="@/assets/report/add_report_time.png" alt="">
                   <span>{{appointTime || '请选择时间'}}</span>
                 </div>
                 <img class="report_arrow" src="@/assets/report/add_report_arrow.png" alt="">
-              </div>
+              </div>-->
               <!--预约时间报备 e -->
             </template>
             <template v-if="currentInfo.component == 'address'">
@@ -109,7 +122,7 @@
         </div>
       </van-popup>
 
-      <van-popup v-model="showDatetime" round position="bottom" :close-on-click-overlay="false">
+      <!--<van-popup v-model="showDatetime" round position="bottom" :close-on-click-overlay="false">
         <van-datetime-picker
           class="dataTime"
           v-if="showDatetime"
@@ -120,7 +133,7 @@
           @confirm="onConfirm"
           @cancel="cancelHandler"
         />
-      </van-popup>
+      </van-popup>-->
     </div>
 <!--  </van-pull-refresh>-->
 </template>
@@ -156,6 +169,12 @@
         driverId: '',
         clickFlag: true,
         isLoading: false,
+        pickerOptions: {
+          // 可选：限制预约时间不能小于当前时间（复用你原有逻辑）
+          disabledDate: (time) => {
+            return time.getTime() <= new Date().getTime();
+          }
+        }
       }
     },
     async mounted() {
@@ -552,6 +571,9 @@
           margin-left: 5px;
         }
       }
+      .owner_time {
+        padding: 0 !important;
+      }
       .report_common_content {
         margin-bottom: 27px;
         .report_textarea {
@@ -582,4 +604,22 @@
   ::v-deep .van-popup__close-icon {
     color: #0F458E;
   }
+  ::v-deep .el-date-editor.el-input,::v-deep .el-date-editor.el-input__inner {
+    width: 100%;
+  }
+  ::v-deep .el-input__inner {
+    background: none !important;
+  }
+  ::v-deep .el-picker-panel {
+    z-index: 100000000 !important;
+  }
+  .el-picker-panel{
+    z-index: 100000000 !important;
+  }
+  ::v-deep .high-zindex-picker {
+    z-index: 9999 !important; // 高于 van-popup 默认层级（通常 1000-2000）
+  }
+  ::v-deep .el-date-editor {
+    overflow: visible !important;
+  }
 </style>