From e53b438ec0093996622839d7312d455f61ee2a24 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 16 Jun 2022 17:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/resource/visitresource.vue | 33 +++++++++++++++++++++++
 src/views/resource/visitspecial.vue  | 39 +++++++++++++++++++++++++---
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/src/views/resource/visitresource.vue b/src/views/resource/visitresource.vue
index 604405a..4e3a4d2 100644
--- a/src/views/resource/visitresource.vue
+++ b/src/views/resource/visitresource.vue
@@ -128,6 +128,20 @@
                 </el-time-select>
               </template>
             </el-table-column>
+            <el-table-column prop="show_start_time" label="实际开始时间">
+              <template slot-scope="scope">
+                <el-time-select
+                  style="width:100%"
+                  v-model="scope.row.show_start_time"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:15',
+                    end: '24:00'
+                  }"
+                  placeholder="选择开始时间">
+                </el-time-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="end_time" label="结束时间">
               <template slot-scope="scope">
                 <el-time-select
@@ -143,6 +157,21 @@
                 </el-time-select>
               </template>
             </el-table-column>
+            <el-table-column prop="show_end_time" label="实际结束时间">
+              <template slot-scope="scope">
+                <el-time-select
+                  style="width:100%"
+                  v-model="scope.row.show_end_time"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:15',
+                    end: '24:00',
+                    minTime: scope.row.start_time
+                  }"
+                  placeholder="选择结束时间">
+                </el-time-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="total" label="可预约人数">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.total" placeholder="请填写可预约人数" autocomplete="off"></el-input>
@@ -233,7 +262,9 @@
           team_min_count: "",
           rules_list:[{
             start_time:"",
+            show_start_time:"",
             end_time:"",
+            show_end_time:"",
             total:""
           }]
         },
@@ -400,6 +431,8 @@
         this.form.rules_list.push({
           start_time: "",
           end_time:"",
+          show_start_time: "",
+          show_end_time:"",
           total:""
         });
       },
diff --git a/src/views/resource/visitspecial.vue b/src/views/resource/visitspecial.vue
index acb9d50..c44e1ba 100644
--- a/src/views/resource/visitspecial.vue
+++ b/src/views/resource/visitspecial.vue
@@ -92,7 +92,7 @@
           <el-table :data="form.rules_list" height="400" class="v-table" style="width: 100%;margin-bottom: 20px;">
             <el-table-column type="index" align="center">
             </el-table-column>
-            <el-table-column prop="start_time" label="开始时间">
+            <el-table-column prop="start_time" label="开始时间">
               <template slot-scope="scope">
                 <el-time-select
                   style="width:100%"
@@ -103,8 +103,22 @@
                     end: '24:00'
                   }"
                   placeholder="选择开始时间">
-                </el-time-select>
-              </template>
+                </el-time-select>
+              </template>
+            </el-table-column>
+            <el-table-column prop="show_start_time" label="实际开始时间">
+              <template slot-scope="scope">
+                <el-time-select
+                  style="width:100%"
+                  v-model="scope.row.show_start_time"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:15',
+                    end: '24:00'
+                  }"
+                  placeholder="选择开始时间">
+                </el-time-select>
+              </template>
             </el-table-column>
             <el-table-column prop="end_time" label="结束时间">
               <template slot-scope="scope">
@@ -121,6 +135,21 @@
                 </el-time-select>
               </template>
             </el-table-column>
+            <el-table-column prop="show_end_time" label="实际结束时间">
+              <template slot-scope="scope">
+                <el-time-select
+                  style="width:100%"
+                  v-model="scope.row.show_end_time"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:15',
+                    end: '24:00',
+                    minTime: scope.row.start_time
+                  }"
+                  placeholder="选择结束时间">
+                </el-time-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="total" label="可预约人数">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.total" placeholder="请填写可预约人数" autocomplete="off"></el-input>
@@ -192,6 +221,8 @@
           rules_list:[{
             start_time:"",
             end_time:"",
+            show_start_time:"",
+            show_end_time:"",
             total:""
           }]
         },
@@ -286,6 +317,8 @@
               that.form.rules_list = [{
                 start_time:"",
                 end_time:"",
+                show_start_time:"",
+                show_end_time:"",
                 total:""
               }]
             }