Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/FinancialSubmodule/BillModuleNew.vue

-<style>
+<style scoped>
     .Myprint p{margin: 0 !important;}
     .Receipt_boxNew{padding: 15px;color: #c94052;width: 100%;background-color: rgba(245, 245, 245, 1);position: relative;}
     .Receipt_boxNew tr th{color: #c94052}

src/components/FinancialModule/FinancialSubmodule/ReceivablesModuleNew.vue

-<style>
+<style scoped>
    .Myprint p{
         margin: 0 !important;
     }

src/components/PrintPageN.vue

@@ -27,7 +27,7 @@
       position: absolute;
       top:10px;
       color:#106BAF;
-      left: -100px;
+      left: -130px;
     }
     ._PrintPage_box .SetDiv span{
         color:#106BAF;

src/components/administrative/happyMoneyDetails.vue

@@ -165,7 +165,7 @@
               <td>¥{{moneyFormat(item.TradeMoney)}}</td>
               <td>{{item.TotalGuestNum}}人</td>
               <td v-if="!hideBtn">¥{{moneyFormat(item.PredictPrice)}}</td>
-              <td v-if="!hideBtn">¥{{moneyFormat(item.PredictPrice)}}</td>
+              <td v-if="!hideBtn">¥{{item.ClosePrice ? moneyFormat(item.ClosePrice) : 0}}</td>
               <td class="_icon_btn" v-if="hideBtn">
                 <el-tooltip class="item" effect="dark" content="设置主门店" placement="top">
                   <i class="iconfont icon-guanli2"@click="setAdmin(item)"></i>
@@ -234,7 +234,7 @@ export default {
   },
   methods: {
     setAdmin: function(obj) {
-      let ParentId = this.$route.query.id
+      let ParentId = this.$route.query.id 
       this.$confirm('确认设置“'+ obj.CustomerName + '”为主门店？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/components/leaderPay2.vue

@@ -545,11 +545,12 @@
 
       <table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
         <tr>
-          <th colspan="12" class="bgwhite">酒店使用</th>
+          <th colspan="13" class="bgwhite">酒店使用</th>
         </tr>
         <tr>
-          <th width="180">使用日期</th>
-          <th width="180">酒店名称</th>
+          <th width="120">使用日期</th>
+          <th width="140">原酒店</th>
+          <th width="140">实际入住酒店</th>
           <th width="">房间类型</th>
           <th width="">预定人数 </th>
           <th width="">单价/人</th>
@@ -569,6 +570,9 @@
               </td>
               <td v-if="subIndex==0 && childIndex == 0" :rowspan="item.row">
                 {{subItem.HotelName}}
+              </td>
+                <td v-if="subIndex==0 && childIndex == 0" :rowspan="item.row">
+                {{subItem.NewHotelName}}
               </td>
               <td>
                 <span v-if="childItem.HouseType === 1">单间</span>