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

src/components/CarDealerOrder/components/OrderList.vue

@@ -748,7 +748,7 @@
             &&pagesTitle=='OP'" class="row-c cursor-pointer radius5 change py5" @click="clickCorrelation(scope.row,2)">
                 <span class="c059FF6">编辑总金额</span>
               </div>
-              <ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="7"></ApplyFoInvoice>
+              <ApplyFoInvoice v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="7"></ApplyFoInvoice>
             </div>
           </div>
           <div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark">

src/components/Hotel/reservation/OrderList.vue

@@ -689,7 +689,7 @@
             </el-tooltip>
           </div>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px" v-if="userInfo&&userInfo.RB_Group_id==2">
           <div class="fz12">{{$t('objFill.invoicedocument')}}</div>
           <div class="row wrap orderNo fz12 py">
             <span
@@ -832,7 +832,7 @@
             <span class="c059FF6">{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span>
           </div>
           <!-- 申请发票 -->
-          <ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="6"></ApplyFoInvoice>
+          <ApplyFoInvoice v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="6"></ApplyFoInvoice>
         </div>
         <!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
             <div class="mb5">已支付</div>

src/components/Hotel/singleProduct/HotelQueryList.vue

@@ -154,8 +154,8 @@
           pageSize: 10,
           //酒店选择数组
           HotelChooseArray: [],
-          StartDate: this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")),
-          EndDate: this.getBeforeDate(-30, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))),
+          StartDate:  '',
+          EndDate: '',
           //只查询日本
           Country: "0",
           Province: 0,

src/components/Hotel/singleProduct/ModifyHotelOrder.vue

@@ -255,7 +255,7 @@
       <div>本次行程<span
           v-if="order.DetailList">{{ order.DetailList.length }}</span>天，入住<span>{{ order.HotelCount }}</span>个酒店</div>
       <div>{{$t('objFill.dindianfukuan')}}：<span>
-          <!-- ¥ -->円</span><b v-if="order.Money">{{ moneyFormat(order.Money) }}</b></div>
+          {{order.CurrencyCode}}</span><b v-if="order.Money">{{ moneyFormat(order.Money) }}</b></div>
       <div>
         <button class="hollowFixedBtn" @click="cancelOrder">取消订单</button>
         <button class="normalBtn" @click="saveOrderHandler">保存订单</button>
@@ -347,8 +347,8 @@
                 <span>入汤税： {{ moneyFormat(y.PriceInTangTax) }}/人</span>
               </div>
               <div class="content-Car-heji">
-                <span>合计：<span>
-                    <!-- ¥ -->円{{ moneyFormat(y.HotelMoeny) }}</span></span>
+                <span>合计：<span>{{y.CurrencyCode}}
+                     {{ moneyFormat(y.HotelMoeny) }}</span></span>
               </div>
             </div>
           </div>
@@ -360,8 +360,9 @@
         <div class="content-header" style="padding: 9px 10px;">
           <span>新日期预定</span>
           <div>
+            <!--:picker-options="beforeCheck"-->
             <el-date-picker class="w150" v-model="newDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
-              :picker-options="beforeCheck"></el-date-picker>
+              ></el-date-picker>
           </div>
         </div>
         <div class="content-Car content-picker-text">
@@ -400,7 +401,7 @@
     },
     data() {
       return {
-        newDate: this.getBeforeDate(-20, new Date().Format("yyyy-MM-dd")),
+        newDate: this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")),
         orderId: 0,
         order: {}, //下单信息
         loading: false,

src/components/scenicSpot/reservation/OrderList.vue

@@ -785,7 +785,7 @@
                 </el-tooltip>
               </div>
             </div>
-            <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
+            <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px" v-if="userInfo&&userInfo.RB_Group_id==2">
               <div class="fz12">{{$t('objFill.invoicedocument')}}</div>
               <div class="row wrap orderNo fz12 py">
                 <span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
@@ -877,7 +877,7 @@
                 <span class="c059FF6">{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span>
               </div>
               <!-- 申请发票 -->
-              <ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="7"></ApplyFoInvoice>
+              <ApplyFoInvoice v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="7"></ApplyFoInvoice>
               <!-- <template v-if="item.OrderStatus==2">
             <div class="column-jac fz12 flex-s c20C997">
               <div class="mb5">已支付</div>