diff --git a/application/admin/view/order_main/index.html b/application/admin/view/order_main/index.html
index 8efbf2a..6d293df 100755
--- a/application/admin/view/order_main/index.html
+++ b/application/admin/view/order_main/index.html
@@ -101,9 +101,9 @@
         </div>
         <div class="header-search" style="width: 100%;margin-bottom: 10px">
             <span>出游人：</span>
-            <el-input v-model="search.customer_name" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
+            <el-input v-model="search.customer_name" style="width: 150px;margin: 5px;" placeholder="请输入内容" clearable></el-input>
             <span>供应商</span>
-            <el-select v-model="search.supplier_id" filterable style="width: 150px;" placeholder="请选择" clearable>
+            <el-select v-model="search.supplier_id" filterable style="width: 150px;margin: 5px;" placeholder="请选择" clearable>
                 <el-option
                         v-for="item in supplierList"
                         :key="item.id"
@@ -113,7 +113,7 @@
             </el-select>
             <span>入住时间</span>
             <el-date-picker
-                    style="width: 150px;"
+                    style="width: 150px;margin: 5px;"
                     v-model="search.startInDate"
                     type="date"
                     value-format="yyyy-MM-dd"
@@ -122,7 +122,7 @@
             </el-date-picker>
             ~
             <el-date-picker
-                    style="width: 150px;"
+                    style="width: 150px;margin: 5px;"
                     v-model="search.endInDate"
                     value-format="yyyy-MM-dd"
                     type="date"
@@ -131,7 +131,7 @@
             </el-date-picker>
             <span>离店时间</span>
             <el-date-picker
-                    style="width: 150px;"
+                    style="width: 150px;margin: 5px;"
                     v-model="search.startOutDate"
                     type="date"
                     value-format="yyyy-MM-dd"
@@ -140,17 +140,19 @@
             </el-date-picker>
             ~
             <el-date-picker
-                    style="width: 150px;"
+                    style="width: 150px;margin: 5px;"
                     v-model="search.endOutDate"
                     value-format="yyyy-MM-dd"
                     type="date"
                     :picker-options="pickerOptions"
                     placeholder="选择日期">
             </el-date-picker>
-            <el-button type="primary" icon="el-icon-search" @click="getData(1)">搜索</el-button>
-            <el-button type="primary" icon="el-icon-plus"  @click="addShow=true" >新增</el-button>
+            <el-button type="primary" icon="el-icon-search" style="margin: 5px;" @click="getData(1)">搜索</el-button>
+            <el-button type="primary" icon="el-icon-plus" style="margin: 5px;"  @click="addShow=true" >新增</el-button>
+            <el-button type="primary" icon="el-icon-plus" style="margin: 5px;" v-if="isExpand == false" @click="zhankai(true)">全部展开</el-button>
+            <el-button type="primary" icon="el-icon-minus" style="margin: 5px;" v-if="isExpand" @click="zhankai(false)">全部收起</el-button>
         </div>
-        <el-table ref="multipleTable" :data="tableData" border tooltip-effect="dark"
+        <el-table v-if="showTable" ref="multipleTable" :default-expand-all="isExpand" :data="tableData" border tooltip-effect="dark"
                   style="font-size:12px;width: 100%;margin-top: 12px">
             <el-table-column width="50">
                 <template slot-scope="scope" >
@@ -437,7 +439,9 @@
                     "memo":""
                 },
                 memoList:[],
-                showMemo:false
+                showMemo:false,
+                isExpand: true,
+                showTable:true
             }
         },
         created() {
@@ -501,6 +505,14 @@
             },
         },
         methods: {
+            zhankai(val){
+                this.isExpand = val;
+                this.showTable = false;
+                setTimeout(e => {
+                    this.showTable = true;
+                   // this.showTable(true)
+                }, 1000); // 定时时间
+            },
             getSupplierList(){
                 axios.post("/hotel.php/cf_suplier_info/getList", this.search).then((response) => {
                     console.log(response)