修复景区报价、优化酒店订单列表

src/components/Hotel/reservation/HotelOrderList.vue

@@ -266,13 +266,20 @@
                 let addList = function(arr){
                   arr.forEach(x=>{
                     x.list = []
+                    x.isMore = false
+                    x.upIcon = false
+                    x.NewDetailList = []
                     // x.Tax = 0
                     // x.Tax2 = 0
                   })
                 }
                 addList(data)
                 data.forEach(item => {
-                  item.DetailList.forEach(x=>{
+                  if(item.DetailList.length>2){
+                    item.isMore = true
+                  }
+                  let dataLists = []
+                  item.DetailList.forEach((x,index)=>{
                     x.Number = 0
                     x.PeopleNumber = 0
                     x.RoomList.forEach(r=>{
@@ -282,7 +289,11 @@
                     x.Tax = x.TaxesPrice*x.Number
                     x.Tax2 = x.PriceInTangTax*x.PeopleNumber
                     x.Money = x.HotelMoeny+x.TaxesPrice
+                    if(index<2){
+                      dataLists.push(x)
+                    }
                   })
+                  item.NewDetailList = JSON.parse(JSON.stringify(dataLists))
                 })
 
                 this.OrderList = data;

src/components/Hotel/reservation/OrderList.vue

@@ -311,7 +311,7 @@
 <template>
   <div>
     <div
-      v-for="(item, index) in OrderList"
+      v-for="(item, index) in OrderList" :key="index"
       class="column bgf radius5 px15 mb20"
     >
       <div class="row-c justify-sb align-c py">
@@ -382,7 +382,7 @@
         </div>
       </div>
       <div class="mb">
-        <el-table :data="item.DetailList" style="width:100%" border>
+        <el-table :data="item.NewDetailList" style="width:100%" border>
           <el-table-column
             label="入住日期"
             min-width="100"
@@ -479,8 +479,9 @@
               {{ item.HandFittingFee ? item.HandFittingFee : "-" }}
             </template>
           </el-table-column>
-          <template slot="append" v-if="item.Remark">
+          <template slot="append" v-if="item.Remark||item.isMore">
             <div style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}</div>
+            <more v-if="item.isMore" @change="ViewMore(item,index)" :upIcon="item.upIcon"></more>
           </template>
         </el-table>
       </div>
@@ -864,7 +865,9 @@
   </div>
 </template>
 <script>
+  import more from '../../public/more.vue';
 export default {
+  components: { more },
   props: ["OrderList","pagesTitle"],
   data() {
     return {
@@ -915,6 +918,20 @@ export default {
     }
   },
   methods: {
+    ViewMore(x,index){
+        x.upIcon = !x.upIcon
+        if(x.upIcon){
+          x.NewDetailList = JSON.parse(JSON.stringify(x.DetailList))
+        }else{
+          x.NewDetailList = []
+          x.DetailList.forEach((y,index)=>{
+            if(index<2){
+              x.NewDetailList.push(y)
+            }
+          })
+        }
+        
+      },
     uploadFileBtn(file){
       let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
       let typeOk = false;

src/components/scenicSpot/scenicSpotPackagePrice.vue

@@ -777,12 +777,12 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             console.log(res.data)
-            //this.initDataTable();
+            this.initDataTable();
             this.Success("保存成功！");
-            // this.isShowDIv = false;
-            // this.resetForm("addMsg");
+            this.isShowDIv = false;
+            this.resetForm("addMsg");
             // this.goUrl('ticketManagement',this.CouponsId);
-            location.reload()
+            // location.reload()
           } else {
             this.Error(res.data.message);
           }