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

76be2ac3 · zhengke · fd646dce · 534a1941 · 76be2ac3 · 76be2ac3
Commit 76be2ac3 authored May 31, 2019 by zhengke
11 changed files
--- a/src/components/Hotel/roomReservationsDetails.vue
+++ b/src/components/Hotel/roomReservationsDetails.vue
@@ -13,7 +13,7 @@
    <div class="query-box" style="border-bottom: none;">
      <ul>
        <li>
-          <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
        </li>
      </ul>
    </div>
@@ -56,9 +56,11 @@
                <table class="hotelTable">
                  <tr>
                    <td colspan="2">
-                      <p class="link" style="word-break: normal;text-align:left;"
+                      <p v-if="IsOperation !=1" class="link" style="word-break: normal;text-align:left;"
                        :class="{'Hotel_red':subItem.HotelChangeState==3}"
                        @click="goUrlR('HotelManagement',subItem.HotelId,'酒店管理')">{{subItem.HotelName}}</p>
+                      <p v-else class="link" style="word-break: normal;text-align:left;"
+                        :class="{'Hotel_red':subItem.HotelChangeState==3}">{{subItem.HotelName}}</p>
                    </td>
                  </tr>
                  <tr>
@@ -116,7 +118,11 @@
              <td v-if="childIndex==0" :rowspan="5">
                <div class="w150">
                  <!--:disabled="subItem.OPState==1"-->
+
+                  <el-select :disabled='IsOperation !=1? false :true' class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
+
                  <el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
+
                    @visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
                    <el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
                      :key='itemHotel.ID'>
@@ -124,10 +130,11 @@
                      <span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
                    </el-option>
                  </el-select>
+
                  <p style="padding-top: 5px;">
                    <a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
                  </p>
-                  <el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
+                  <el-upload v-if="IsOperation !=1" :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
                    <el-button size="small" type="danger" @click='getItem(index, subIndex)'>
                      {{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
                  </el-upload>
@@ -135,6 +142,18 @@
              </td>
              <!-- 房间数 -->
              <td>
+
+                <el-input v-if="IsOperation !=1" class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
+                  v-model='childItem.HouseTypeCount'></el-input>
+                <span v-else>{{childItem.HouseTypeCount}}</span>
+              </td>
+              <!-- 预定人数 -->
+              <td>
+                <el-input v-if="IsOperation !=1" class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
+                  @input="calculationPrice(subItem)" v-model='childItem.BookNum'></el-input>
+                <span v-else>{{childItem.BookNum}}</span>
+
+
                <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
                  v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
              </td>
@@ -143,6 +162,7 @@
                <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
                  @input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="childIndex<4?true:false">
                </el-input>
+
              </td>
              <!-- 尚差房间数 -->
              <td>
@@ -153,15 +173,17 @@
              </td>
              <!-- 单价/每人 -->
              <td>
-                <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
+                <el-input v-if="IsOperation !=1" @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
                  @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'>
                </el-input>
+                <span v-else>{{childItem.UnitPrice}}</span>
              </td>
              <!-- 免减人数 -->
              <td>
-                <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')"
+                <el-input v-if="IsOperation !=1" class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')"
                  v-model='childItem.HotelDiscount' @input="calculationPrice(subItem)">
                </el-input>
+                <span v-else>{{childItem.HotelDiscount}}</span>
              </td>
              <!-- 金额小计 -->
              <td style="white-space:nowrap;">
@@ -170,7 +192,7 @@
              <!--返佣-->
              <td>
                <p class="pHouseStyle link" @input="calculationPrice(subItem)">
-                  <span class="spanlink" v-if='childItem.IsRebateRatio==0'
+                  <span class="spanlink" v-if='childItem.IsRebateRatio==0 && IsOperation !=1'
                    @click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span>
                  <span v-if='childItem.IsRebateRatio!=0'>{{childItem.RebateRatio}}</span>
                </p>
@@ -185,7 +207,7 @@
                  <tr>
                    <td width="70" style="text-align:right;">订房状态：</td>
                    <td>
-                      <el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')">
+                      <el-select :disabled='IsOperation !=1? false :true' class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')">
                        <el-option label='请选择' :value='0'></el-option>
                        <el-option label='确定' :value='1'></el-option>
                        <el-option label='暂定' :value='2'></el-option>
@@ -198,7 +220,7 @@
                  <tr>
                    <td width="70" style="text-align:right;">付款方式：</td>
                    <td>
-                      <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
+                      <el-select :disabled='IsOperation !=1? false :true' class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
                        <el-option label='请选择' :value='0'></el-option>
                        <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
                        <el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
@@ -224,7 +246,8 @@
                  <tr>
                    <td width="70" style="text-align:right;">订团号：</td>
                    <td>
-                      <el-input class='w135' v-model='subItem.ReserveNo'></el-input>
+                      <el-input v-if="IsOperation !=1" class='w135' v-model='subItem.ReserveNo'></el-input>
+                      <span v-else>{{subItem.ReserveNo}}</span>
                    </td>
                  </tr>
                  <tr>
@@ -233,13 +256,14 @@
                  <tr>
                    <td width="70" style="text-align:right;">备注：</td>
                    <td>
-                      <el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
+                      <el-input v-if="IsOperation !=1" type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
+                      <span v-else>{{subItem.Remarks}}</span>
                    </td>
                  </tr>
                </table>
              </td>
              <!-- 操作 -->
-              <td v-if="childIndex==0" :rowspan="5">
+              <td v-if="childIndex==0 && IsOperation !=1" :rowspan="5">
                <!--v-if="subItem.OPState!=1"-->
                <template v-if="subItem.OPState!=1">
                   <span class="Hotel_red">OP选房确认</span>
@@ -293,6 +317,7 @@
        checkedsubIndex: '',
        loading: false,
        boxHeight: 0,
+        IsOperation:'',
      }
    },
    methods: {
@@ -410,6 +435,8 @@
          NewCombinationNum: this.$route.query.NewCombinationNum
        }, res => {
          if (res.data.resultCode == 1) {
+            this.IsOperation = res.data.data.IsOperation;
+            console.log(res.data.data.IsOperation)
            let list = res.data.data.HotelOrderListReport;
            this.CreateBy = res.data.data.CreateBy;
            this.CreateByPhoto = res.data.data.CreateByPhoto;

--- a/src/components/Restaurant/bookDinnerStatisticsDetails.vue
+++ b/src/components/Restaurant/bookDinnerStatisticsDetails.vue
@@ -3,8 +3,8 @@
    <div class="query-box" style="border-bottom: none;">
      <ul>
        <li>
-          <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
+          <input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
        </li>
      </ul>
    </div>
@@ -45,8 +45,10 @@
                <table class="dinnerTable">
                  <tr>
                    <td colspan="2">
-                      <span style="padding-left:5px;" class="link"
+                      <span style="padding-left:5px;" class="link" v-if="IsOperation != 1"
                        @click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}}</span>
+                      <span style="padding-left:5px;" class="link" v-else>{{subItem.DiningName}}</span>
+
                    </td>
                  </tr>
                  <tr>
@@ -68,11 +70,12 @@
                </table>
              </td>
              <td v-if="childIndex==0" :rowspan="3">
-                <el-select class='w160 sel' v-model='subItem.NewDiningID' filterable :placeholder="$t('pub.pleaseSel')"
+                <el-select :disabled='IsOperation !=1? false :true' class='w160 sel' v-model='subItem.NewDiningID' filterable :placeholder="$t('pub.pleaseSel')"
                  @visible-change='getDingList(item)' @change='sendValue(subItem,item)'>
                  <el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
                    :key='itemHotel.ID'></el-option>
                </el-select>
+
              </td>
              <td v-if="childIndex==0" :rowspan="3">
                {{subItem.UseDinnerTypeStr}}
@@ -90,20 +93,22 @@
                {{childItem.PeopleNum}}
              </td>
              <td>
-                <span class="spanlink" v-if='childItem.PeoplePrice==0'
+                <span class="spanlink" v-if='childItem.PeoplePrice==0 && IsOperation != 1'
                  @click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
                <span v-if='childItem.PeoplePrice!=0'>{{childItem.PeoplePrice}}</span>
              </td>
              <td>
-                <el-input class='w50 tcenter' @input='calculationPrice(subItem)' maxlength='2'
+                <el-input v-if="IsOperation !=1" class='w50 tcenter' @input='calculationPrice(subItem)' maxlength='2'
                  v-model='childItem.Discount' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
+                <span v-else>{{childItem.Discount}}</span>
              </td>
              <td>
                {{(childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice}}
              </td>
              <td>
-                <el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.DiscountPrice'
-                  @keyup.native="checkInteger(childItem,'DiscountPrice')"></el-input>%
+                <el-input v-if="IsOperation !=1" class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.DiscountPrice'
+                  @keyup.native="checkInteger(childItem,'DiscountPrice')"></el-input><span v-else>{{childItem.DiscountPrice}}</span>%
+
              </td>
              <td v-if="childIndex==0" :rowspan="3">
                {{subItem.TotalPrice}}
@@ -115,7 +120,8 @@
                      付款方式：
                    </td>
                    <td style="text-align:left;">
-                      <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
+
+                      <el-select :disabled='IsOperation !=1? false :true' class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
                        <el-option label='请选择' :value='0'></el-option>
                        <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
                        <el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
@@ -123,15 +129,16 @@
                        <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
                        <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
                        <el-option label='公司合团支付' :value='6'></el-option>
+
                      </el-select>
-                    </td>
+                      </td>
                  </tr>
                  <tr>
                    <td width="60" style="text-align:right;">
                      订餐方式：
                    </td>
                    <td style="text-align:left;">
-                      <el-select v-model='subItem.DiningReserveType' class='w135 sel'
+                      <el-select :disabled='IsOperation !=1? false :true' v-model='subItem.DiningReserveType' class='w135 sel'
                        :placeholder="$t('pub.pleaseSel')">
                        <el-option label='请选择' value='0'></el-option>
                        <el-option label='公司预订' value='1'></el-option>
@@ -152,13 +159,15 @@
                      订团号：
                    </td>
                    <td style="text-align:left;">
-                      <el-input class='w135 tcenter' v-model='subItem.ReserveNo'></el-input>
+                      <el-input v-if="IsOperation !=1" class='w135 tcenter' v-model='subItem.ReserveNo'></el-input>
+                      <span v-else>{{subItem.ReserveNo}}</span>
                    </td>
                  </tr>
                </table>
              </td>
              <td v-if="childIndex==0" :rowspan="3">
-                <el-input type='textarea' rows="4" class='w120' v-model='subItem.Remarks'></el-input>
+                <el-input v-if="IsOperation !=1" type='textarea' rows="4" class='w120' v-model='subItem.Remarks'></el-input>
+                <span v-else>{{subItem.Remarks}}</span>
              </td>
            </tr>
          </template>
@@ -179,6 +188,7 @@
        flightTotal: 0,
        GuestNum: 0,
        loading: false,
+        IsOperation:'',
      };
    },
    methods: {
@@ -231,7 +241,8 @@
          res => {
            this.loading = false;
            if (res.data.resultCode == 1) {
-              this.list = res.data.data;
+              this.list = res.data.data.DiningList;
+              this.IsOperation = res.data.data.IsOperation;
              this.list.forEach(item => {
                item.DinnerList = [];
                item.DiningSummaryList.forEach(x => {

--- a/src/components/SalesModule/enrollTotal.vue
+++ b/src/components/SalesModule/enrollTotal.vue
@@ -193,6 +193,7 @@
            <p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
            <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
            <p>发团：{{item.startDate}}</p>
+            <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
            <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
            <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
            <div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
@@ -219,8 +220,8 @@
          <td>
            <p style="color:#FF9C00">￥{{item.preferPrice}}</p>
          </td>
-          
-          
+
+
          <td>
            <span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
            <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>

--- a/src/components/SalesModule/groupTourOrder.vue
+++ b/src/components/SalesModule/groupTourOrder.vue
@@ -1512,7 +1512,7 @@
        <tbody v-for="(item,index) in list" :key="index">
          <tr>
            <td rowspan="3">
-              
+
              <p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
              <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
                @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
@@ -1522,6 +1522,7 @@
              <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
              <p style="min-width: 180px;">发团：{{item.startDate}}</p>
              <p>下单时间：{{item.createDate}}</p>
+              <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
              <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
              <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
            </td>
@@ -1738,13 +1739,14 @@
          </tr>
          <tr style="height:20px">
            <td colspan="16" class="RL_Order" style="height:20px">
-              <span class="RL-remarkTitle">名单:</span>
+              <span class="RL-remarkTitle"  v-if="item.guestList.length>0">名单:</span>
              <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
                <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
              </span>
-              <span class="RL-redType RL-remarkCon" v-else>
-                <span>暂无名单</span>
-              </span>
+<!--              <span class="RL-redType RL-remarkCon" v-else>-->
+<!--                <span>暂无名单</span>-->
+<!--              </span>-->
+              <span style="display: block">房间信息：{{item.orderGuestHouseStr}}</span>
              <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
            </td>
          </tr>
@@ -2652,7 +2654,7 @@
        this.showID = data
      },
      getRemarks(obj) {
-        // 华国豪5-5新增 
+        // 华国豪5-5新增
        if (moment().format("YYYY-MM-DD") >= obj.startDate) {
          this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
              confirmButtonText: "确定",
@@ -2683,7 +2685,7 @@
          this.remarksMsg.isOrder = obj.isOrder
        }
      },
-      getDetail(obj) { 
+      getDetail(obj) {
        this.Ysze = false;
        this.starTime = obj.startDate
        this.endTime = obj.backDate
@@ -3472,7 +3474,7 @@
          err => {}
        )
      },
-      getDdlyList(id) { 
+      getDdlyList(id) {
        this.apipost(
          'sellorder_get_GetSellClientSourceEnumList', {
            typeId: id

--- a/src/components/SalesModule/groupTourOrderByTuan.vue
+++ b/src/components/SalesModule/groupTourOrderByTuan.vue
@@ -1526,6 +1526,7 @@
              </div>
              <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
              <p>下单时间：{{item.createDate}}</p>
+              <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
              <template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">
                <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
                <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
@@ -1745,13 +1746,14 @@
        </tr>
        <tr style="height:20px">
            <td colspan="15" class="RL_Order" style="height:20px">
-              <span class="RL-remarkTitle">名单:</span>
-              <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
+              <span class="RL-remarkTitle" v-if="item.guestList.length>0 && item.isOwn !=2">名单:</span>
+              <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0 && item.isOwn !=2">
                <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
              </span>
-              <span class="RL-redType RL-remarkCon" v-else>
-                <span>暂无名单</span>
-              </span>
+<!--              <span class="RL-redType RL-remarkCon" v-else>-->
+<!--                <span>暂无名单</span>-->
+<!--              </span>-->
+              <span style="display: block">房间信息：{{item.orderGuestHouseStr}}</span>
              <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
            </td>
          </tr>
@@ -3142,7 +3144,7 @@ submitYSZEForm(){
              },
              err => {}
            );
-            
+
          } else {
          }
        },
@@ -3224,7 +3226,7 @@ submitYSZEForm(){
      );
    },
    getRemarks(obj) {
-      // 华国豪5-5新增 
+      // 华国豪5-5新增
      if (moment().format("YYYY-MM-DD") >= obj.startDate){
        this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
          confirmButtonText: "确定",
@@ -3256,7 +3258,7 @@ submitYSZEForm(){
        this.remarksMsg.Remarks = obj.remarks;
        this.remarksMsg.OldRemarks = obj.remarks;
      }
-     
+
      //HK 新加
      if(this.userId==1 || this.userId==5|| this.positionId==168)
      {

--- a/src/components/TravelManager/TravelList/RegistrationList.vue
+++ b/src/components/TravelManager/TravelList/RegistrationList.vue
@@ -1539,6 +1539,7 @@
                  style="color:red">({{item.LeaveStr}})</span></div>
              <div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div>
              <p>下单时间：{{item.CreateDate}}</p>
+              <p v-if="item.TradeWay ==1">{{item.PlatformOrder}}</p>
            </td>
            <td>
              <p class="fz12 over_ellipsis" style="width: 90%;">领队控位
@@ -1682,14 +1683,15 @@
          </tr>
          <tr>
            <td colspan="13" class="RL_Order">
-              <span class="RL-remarkTitle">名单:</span>
+              <span class="RL-remarkTitle" v-if="item.GuestList.length>0">名单:</span>
              <p class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
                <span style="color:blue !important" v-for="(childItem) in item.GuestList"
                  @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
              </p>
-              <p class="RL-redType RL-remarkCon" v-else>
-                <span>暂无名单</span>
-              </p>
+<!--              <p class="RL-redType RL-remarkCon" v-else>-->
+<!--                <span>暂无名单</span>-->
+<!--              </p>-->
+              <span>房间信息：{{item.OrderGuestHouseStr}}</span>
              <span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
            </td>
          </tr>
@@ -1744,6 +1746,7 @@
                    style="color:red">({{childItem.LeaveStr}})</span></div>
                <div class="RL_CreatInfo">关联销售：{{childItem.CommissionSPeopleName}}</div>
                <p>下单时间：{{childItem.CreateDate}}</p>
+                <p v-if="childItem.TradeWay ==1">{{childItem.PlatformOrder}}</p>
                <p v-if='childItem.CommissionMoney' style="color:red">提成：{{childItem.CommissionMoney}}</p>
                <p v-else-if="childItem.LatestCommissionMoney" style="color:red">提成：{{childItem.LatestCommissionMoney}}
                </p>
@@ -1944,14 +1947,15 @@
            </tr>
            <tr>
              <td colspan="13" class="RL_Order">
-                <span class="RL-remarkTitle">名单:</span>
+                <span class="RL-remarkTitle" v-if="childItem.GuestList.length>0">名单:</span>
                <span class="RL-redType RL-remarkCon" v-if="childItem.GuestList.length>0">
                  <span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList"
                    @click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
                </span>
-                <span class="RL-redType RL-remarkCon" v-else>
-                  <span>暂无名单</span>
-                </span>
+<!--                <span class="RL-redType RL-remarkCon" v-else>-->
+<!--                  <span>暂无名单</span>-->
+<!--                </span>-->
+                <span style="display: block">房间信息：{{childItem.OrderGuestHouseStr}}</span>
                <span v-if="childItem.TipMoney" style="color:red">（小费：{{childItem.TipMoney}}）</span>
              </td>
            </tr>
@@ -2262,14 +2266,14 @@
          </tr>
          <tr>
            <td colspan="13" class="RL_Order">
-              <span class="RL-remarkTitle">名单:</span>
+              <span class="RL-remarkTitle" v-if="item.GuestList.length>0">名单:</span>
              <span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
                <span style="color:blue !important" v-for="(childItem) in item.GuestList"
                  @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
              </span>
-              <span class="RL-redType RL-remarkCon" v-else>
-                <span>暂无名单</span>
-              </span>
+<!--              <span class="RL-redType RL-remarkCon" v-else>-->
+<!--                <span>暂无名单</span>-->
+<!--              </span>-->
              <span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
            </td>
          </tr>

--- a/src/components/public/leftNav.vue
+++ b/src/components/public/leftNav.vue
@@ -56,11 +56,11 @@
        <ul class="clearfix flash_menu_left">
          <li v-if="ShortcutMenu.length<1" class="fl" >
            <div @click="singleMenUlayerShow2 = true, singleMenUlayerShow = false">
-              <i 
+              <i
                class="iconfont icon-mui-icon-add add_more"></i>
            </div>
            <p @click="singleMenUlayerShow2 = true, singleMenUlayerShow = false">新增快捷菜单</p>
-            
+
          </li>
          <li v-for="(item, index) in ShortcutMenu" class="fl" >
            <i v-if="singleMenUlayerShow2" class="iconfont icon-Close" @click="deleteFlash(item, index)"></i>
@@ -116,7 +116,7 @@
        this.$forceUpdate()
      },
      // 添加快捷菜单
-      addFlash: function (item, index, fIndex) { 
+      addFlash: function (item, index, fIndex) {
        item.IsShortcutMenu = item.IsShortcutMenu === 1 ? 2 : 1
        if (item.IsShortcutMenu === 1) {
          let repeat = false
@@ -184,7 +184,7 @@
              })
              this.ShortcutMenu = ShortcutMenu
            }
-            
+
          }
        })
        this.activeName = this.items[0].MenuName
@@ -274,8 +274,8 @@
 .flash_menu{
  text-align: center;
  position: relative;
-  margin: 5px; 
-  padding: 10px; 
+  margin: 5px;
+  padding: 10px;
  width: 97px;
 }
 .flash_menu .menu_icon i.iconfont{

--- a/src/components/sale/sale.vue
+++ b/src/components/sale/sale.vue
--- a/src/components/scenicSpot/admissionStatisticsDetails.vue
+++ b/src/components/scenicSpot/admissionStatisticsDetails.vue
@@ -3,8 +3,8 @@
    <div class="query-box" style="border-bottom: none;">
      <ul>
        <li>
-          <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
+          <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
        </li>
      </ul>
    </div>
@@ -74,15 +74,17 @@
                {{childItem.PeopleNum}}
              </td>
              <td>
-                <el-input class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number"
+                <el-input v-if="IsOperation !=1" class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number"
                  @input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'UsePeopleNum')"></el-input>
+                <span v-else>{{childItem.UsePeopleNum}}</span>
              </td>
              <td>
-                <el-input class='w50 tcenter' maxlength='2' v-model='childItem.Discount' type="number"
+                <el-input v-if="IsOperation !=1" class='w50 tcenter' maxlength='2' v-model='childItem.Discount' type="number"
                  @input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
+                <span v-else>{{childItem.Discount}}</span>
              </td>
              <td>
-                <span class="spanlink" v-if='childItem.PeoplePrice==0'
+                <span class="spanlink" v-if='childItem.PeoplePrice==0 && IsOperation !=1'
                  @click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
                <span v-if='childItem.PeoplePrice!=0'>{{childItem.PeoplePrice}}</span>
              </td>
@@ -90,7 +92,7 @@
                {{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
              </td>
              <td>
-                <span class="spanlink" v-if='childItem.DiscountPrice==0'
+                <span class="spanlink" v-if='childItem.DiscountPrice==0 && IsOperation !=1'
                  @click="goUrl('scenicSpotInfoManage',subItem,'景区列表')">设置</span>
                <span v-if='childItem.DiscountPrice!=0'>{{childItem.DiscountPrice}}%</span>
              </td>
@@ -104,23 +106,14 @@
                      付款方式：
                    </td>
                    <td style="text-align:left;">
-                      <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
-                        <el-option label='请选择' :value='0' ></el-option>
-                        <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
-                        <el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
-                        <el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
-                        <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
-                        <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
-                        <el-option label='公司合团支付' :value='6'></el-option>
+                      <el-select :disabled='IsOperation !=1? false :true' class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
+                        <el-option label='请选择' value='0'></el-option>
+                        <el-option label='现付' value='1'></el-option>
+                        <el-option label='签单' value='2'></el-option>
+                        <el-option label='实物抵扣' value='5'></el-option>
+                        <el-option label='预付' value='4'></el-option>
                      </el-select>
-                    </td>
-                  </tr>
-                  <tr v-show="subItem.PayStyle==6">
-                    <td width="60" style="text-align:right;">
-                      付款团号：
-                    </td>
-                    <td style="text-align:left;">
-                      <el-input class='w135' v-model='subItem.PayTypeTCNUM' type="text"></el-input>
+
                    </td>
                  </tr>
                  <tr>
@@ -128,13 +121,15 @@
                      订团号：
                    </td>
                    <td style="text-align:left;">
-                      <el-input class='w135' v-model='subItem.CombinationNum' type="text"></el-input>
+                      <el-input v-if="IsOperation !=1" class='w135' v-model='subItem.CombinationNum' type="text"></el-input>
+                      <span v-else>{{subItem.CombinationNum}}</span>
                    </td>
                  </tr>
                </table>
              </td>
-              <td v-if="childIndex==0" :rowspan="3">
-                <el-input type='textarea' rows="4" class='w170' v-model='subItem.Remarks'></el-input>
+              <td v-if="childIndex==0" :rowspan="3" >
+                <el-input v-if="IsOperation !=1" type='textarea' rows="4" class='w170' v-model='subItem.Remarks'></el-input>
+                <span v-else>{{subItem.Remarks}}</span>
              </td>
            </tr>
          </template>
@@ -154,6 +149,7 @@
        flightTotal: 0,
        GuestNum: 0,
        loading: false,
+        IsOperation:'',
      }
    },
    methods: {
@@ -189,9 +185,11 @@
        }, res => {
          this.loading = false;
          if (res.data.resultCode == 1) {
-            this.DataList = res.data.data;
+            this.DataList = res.data.data.ScenicList;
+            this.IsOperation = res.data.data.IsOperation;
            this.DataList.forEach(item => {
              item.ScenicStatisticsList.forEach(x => {
+                x.PayStyle = x.PayStyle.toString();
                this.calculationPrice(x);
                if (x.CombinationNum == '' || x.CombinationNum == null) {
                  x.CombinationNum = this.$route.query.NewCombinationNum;
@@ -212,8 +210,9 @@
                if (!subItem.Discount) {
                  subItem.Discount = 0;
                }
-                if (!subItem.UsePeopleNum) {
-                  subItem.UsePeopleNum = 0;
+                 if(!subItem.UsePeopleNum)
+                {
+                  subItem.UsePeopleNum=0;
                }
              });
            })
@@ -227,8 +226,9 @@
                if (!subItem.Discount) {
                  subItem.Discount = 0;
                }
-                if (!subItem.UsePeopleNum) {
-                  subItem.UsePeopleNum = 0;
+                if(!subItem.UsePeopleNum)
+                {
+                  subItem.UsePeopleNum=0;
                }
              });
            })

--- a/src/plug/index.js
+++ b/src/plug/index.js
@@ -119,6 +119,10 @@ export default {
        let domainUrl = '';
        let locationName = window.location.hostname;
        domainUrl = "http://192.168.2.214:8082"; //214主域名
+        domainUrl = "http://192.168.2.65:8025"; //214主域名
+        // domainUrl = "http://192.168.0.119:8082";
+        domainUrl = "http://192.168.2.16:8083";
+        // domainUrl = "http://reborn.oytour.com"
        if (locationName.indexOf('oytour') !== -1) {
          domainUrl = "http://reborn.oytour.com";
        } else if (locationName.indexOf('viitto') !== -1) {
@@ -308,25 +312,25 @@ export default {
        if (msg == null || msg == "") {
          msg = {}
        }
-        var apiNewurl = this.domainManager().PostUrl;
+        var apiNewurl = this.domainManager().DomainUrl;
        var timestamp = (new Date()).valueOf();
-   
+        apiNewurl = apiNewurl + "/Api/Trip/" + cmd;
        if (this.$route.path.toLowerCase() == "/signature") {
          this.$router.push({
            path: '/signature'
          })
        } else {
-          if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/supplierLogin") {
+          if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
            this.$router.push({
-              path: '/supplierLogin'
+              path: '/login'
            })
          }
        }
        var token = "";
        var key = "";
-        if (this.getLocalStorageSupplier() != null) {
-          token = this.getLocalStorageSupplier().Token;
-          key = this.getLocalStorageSupplier().SecretKey;
+        if (this.getLocalStorage() != null) {
+          token = this.getLocalStorage().token;
+          key = this.getLocalStorage().SecretKey;
        }
        var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
        var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
@@ -336,7 +340,7 @@ export default {
          "timestamp": timestamp,
          "token": token,
          "sign": md5Str,
-          "uid": this.getLocalStorageSupplier()!=null?this.getLocalStorageSupplier().SupplierAccountId:0
+          "uid": this.getLocalStorage().EmployeeId
        }

        this.$http.post(apiNewurl, postData, {
@@ -348,7 +352,7 @@ export default {
          .then(res => {
            if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
              this.$router.push({
-                path: '/supplierLogin'
+                path: '/login'
              });
            } else if (res.resultCode == 10005) {
              this.$router.go(-1);
@@ -461,15 +465,6 @@ export default {
        }
      },

-      //获取登录的供应商信息
-      Vue.prototype.getLocalStorageSupplier = function () {
-        var localStorageData = window.localStorage["SupplierInfo"];
-        if (localStorageData !== undefined && localStorageData != 'undefined') {
-          return JSON.parse(localStorageData);
-        } else {
-          return null;
-        }
-      },

      //PDF预览
      Vue.prototype.previewPDF = function (url) {

--- a/src/router/config.js
+++ b/src/router/config.js
 import login from '../components/Login'
 import index from '../components/index'
-// import supplierLogin from '../components/SupplierLogin'
-// import supplierIndex from '../components/SupplierIndex'
-
 export default {
    routes: [{
            path: '/',
@@ -699,6 +696,46 @@ export default {
                                title: '酒店查询统计'
                            },
                        },
+                        {
+                            path: '/HotelManagement2',    //供应商->酒店管理
+                            name: 'HotelManagement2',
+                            component: resolve => require(['@/components/Supplier/HotelManagement'], resolve),
+                            meta: {
+                                title: '酒店管理'
+                            },
+                        },
+                        {
+                            path: '/HotelSalesBoard2',    //供应商->酒店统计
+                            name: 'HotelSalesBoard2',
+                            component: resolve => require(['@/components/Supplier/HotelSalesBoard'], resolve),
+                            meta: {
+                                title: '酒店统计'
+                            },
+                        },
+                        {
+                            path: '/HotelTotalStock2',    //供应商->总库存看板
+                            name: 'HotelTotalStock2',
+                            component: resolve => require(['@/components/Supplier/HotelTotalStock'], resolve),
+                            meta: {
+                                title: '总库存看板'
+                            },
+                        },
+                        {
+                            path: '/roomQuery2',    //供应商->定房查询
+                            name: 'roomQuery2',
+                            component: resolve => require(['@/components/Supplier/roomQuery'], resolve),
+                            meta: {
+                                title: '定房查询'
+                            },
+                        },
+                        {
+                            path: '/HotelQueryList2',    //供应商->酒店查询
+                            name: 'HotelQueryList2',
+                            component: resolve => require(['@/components/Supplier/HotelQueryList'], resolve),
+                            meta: {
+                                title: '酒店查询'
+                            },
+                        },
                        {
                            path: '/RestauranOrder', //餐厅订单信息
                            name: 'RestauranOrder',
@@ -3308,7 +3345,7 @@ export default {
                            meta: {
                                title: '商品类型'
                            }
-                        },
+                        },                       
                        {
                            path: '/IntegralMall',
                            name: 'IntegralMall',
@@ -3325,14 +3362,6 @@ export default {
                                title: '新增商品'
                            }
                        },
-                        {
-                            path: '/CommodityActive',
-                            name: 'CommodityActive',
-                            component: resolve => require(['@/components/activity/CommodityActive'], resolve),
-                            meta: {
-                                title: '商品活动'
-                            }
-                        },
                    ]
                },
                {