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

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -506,6 +506,7 @@
   .PQ_HotelPop table th {
     text-align: center;
   }
+
   .buy-box {
     position: fixed;
     bottom: 0;
@@ -533,6 +534,7 @@
   .p20 {
     padding: 20px;
   }
+
 </style>
 
 <template>
@@ -556,78 +558,7 @@
               type="date"></el-date-picker>
           </span>
         </li>
-        <li style="
-            height: 34px;
-            line-height: 34px;
-            padding: 0 0 0 20px;
-            vertical-align: middle;
-          ">
-          <el-popover width="260" trigger="click">
-            <div>
-              <div class="TC_queryTitle">
-                {{ $t("Operation.Op_TeamWarningSearch") }}
-              </div>
-              <div class="clearfix">
-                <div class="TC_leftSearch">
-                  <div>
-                    <span style="
-                        display: inline-block;
-                        margin: 0 5px 0 0;
-                        width: 50px;
-                        text-align: right;
-                      ">{{ $t("leader.leader_registraNum") }}</span>
-                    <el-select v-model="msg.WarningQuery" filterable :placeholder="$t('system.ph_buxian')" class="w150">
-                      <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
-                      <el-option :label="$t('salesModule.Nobaoming')" value="1"></el-option>
-                      <el-option :label="$t('salesModule.Less10')" value="2"></el-option>
-                      <el-option :label="$t('salesModule.More10')" value="3"></el-option>
-                      <el-option :label="$t('salesModule.YWLess5')" value="4"></el-option>
-                      <el-option :label="$t('salesModule.YHBRS')" value="5"></el-option>
-                    </el-select>
-                  </div>
-                  <div>
-                    <span style="
-                        display: inline-block;
-                        margin: 0 5px 0 0;
-                        width: 50px;
-                        text-align: right;
-                      ">{{ $t("Operation.Op_daysChoice") }}</span>
-                    <el-select v-model="msg.RateOnDay" filterable :placeholder="$t('system.ph_buxian')" class="w150">
-                      <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
-                      <el-option :label="$t('salesModule.Inner10')" value="1"></el-option>
-                      <el-option :label="$t('salesModule.Inner15')" value="2"></el-option>
-                      <el-option :label="$t('salesModule.Inner20')" value="3"></el-option>
-                      <el-option :label="$t('salesModule.Out20')" value="4"></el-option>
-                    </el-select>
-                  </div>
-                  <div>
-                    <span style="
-                        display: inline-block;
-                        margin: 0 5px 0 0;
-                        width: 50px;
-                        text-align: right;
-                      ">{{ $t("Operation.Op_Attendance") }}</span>
-                    <el-select v-model="msg.RateOn" filterable :placeholder="$t('system.ph_buxian')" class="w150">
-                      <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
-                      <el-option label="100%" value="1"></el-option>
-                      <el-option :label="$t('salesModule.Nomore80')" value="2"></el-option>
-                      <el-option :label="$t('salesModule.Nomore60')" value="3"></el-option>
-                      <el-option :label="$t('salesModule.Nomore40')" value="4"></el-option>
-                    </el-select>
-                  </div>
-                </div>
-              </div>
-              <button class="normalBtn TC_SearchBtn" @click="
-                  getList();
-                  resetPageIndex();
-                ">
-                {{ $t("pub.searchBtn") }}
-              </button>
-            </div>
-            <span slot="reference" style="cursor: pointer">{{ $t("Operation.Op_warningSearch")
-              }}<i class="iconfont icon-xiaotuziCduan_1"></i></span>
-          </el-popover>
-        </li>
+
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="
               getList();
@@ -649,7 +580,7 @@
             <div class="el-col w_20">
               <div class="p20">
                 <div class="mb title"><i class="iconfont icon-biaoti1"></i><span>包机信息</span></div>
-                  <div class="mb"><span>{{item.GTeamName}}</span></div>
+                <div class="mb"><span>{{item.Title}}</span></div>
                 <div>出发日期：<span>{{item.StartDate}}</span></div>
                 <div>团队信息：<span>{{item.TCNUM}}({{item.TCID}})</span></div>
               </div>
@@ -666,7 +597,7 @@
             </div>
             <div class="el-col w_10">
               <div class="p20">
-                  <div class="mb title"><i class="iconfont icon-jiage"></i><span>仓位信息</span></div>
+                <div class="mb title"><i class="iconfont icon-jiage"></i><span>团位信息</span></div>
                 <div class="mb"><span>经济舱: {{item.YSeat}}</span></div>
                 <div class="mb"><span>商务舱: {{item.CSeat}}</span></div>
                 <div class="mb"><span>头等舱: {{item.FSeat}}</span></div>
@@ -675,7 +606,7 @@
             <div class="el-col w_10">
               <div class="p20">
                 <div class="mb title"><i class="iconfont icon-jiage"></i><span>价格信息</span></div>
-                  <div class="mb"><span>中心价: {{item.MiddlePrice}}</span></div>
+                <div class="mb"><span>中心价: {{item.B2BMemberPrice}}</span></div>
                 <div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div>
                 <div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
                 <div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div>
@@ -692,7 +623,7 @@
             <div class="el-col w_10">
               <div class="p20">
                 <div class="mb title"><i class="iconfont icon-yuangong"></i><span>发起信息</span></div>
-                  <div class="mb">发起人：{{item.CreateByName}}</div>
+                <div class="mb">发起人：{{item.OPName}}</div>
                 <div>{{item.CreateTime}}</div>
               </div>
             </div>
@@ -706,17 +637,8 @@
                     <i class="el-icon-arrow-down el-icon--right"></i>
                   </span>
                   <el-dropdown-menu slot="dropdown" class="travelControlDropDown">
-                      <el-dropdown-item>
-                        财务入账
-                      </el-dropdown-item>
-                      <el-dropdown-item>
-                        财务审核
-                      </el-dropdown-item>
-                      <el-dropdown-item>
-                        包机结算
-                      </el-dropdown-item>
-                      <el-dropdown-item>
-                        删除
+                    <el-dropdown-item @click.native="gotoOrder(item)">
+                      报名清单
                     </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -855,25 +777,9 @@
         msg: {
           pageIndex: 1,
           pageSize: 10,
-          LineId: "-1",
-          LineTeamId: "-1",
-          AimPlaceId: "-1",
           TCID: "",
           StartTime: "",
           EndTime: "",
-          BranchId: "-1",
-          CityId: "-1",
-          DaysTrip: "",
-          SalePlat: [],
-          minGroupSize: "",
-          maxGroupSize: "",
-          minApplySize: "",
-          maxApplySize: "",
-          FlightID: "-1",
-          TCIDList: "",
-          WarningQuery: "-1",
-          RateOnDay: "-1",
-          RateOn: "-1",
         },
         list: [],
         LineList: [],
@@ -971,6 +877,13 @@
       },
     },
     methods: {
+      //跳转到报名清单
+      gotoOrder(item) {
+        this.OpenNewPage('/groupTourOrderByTuan', {
+          id: item.TCID,
+          tcmun: item.TCNUM
+        });
+      },
       saveOrder(addMsg) {
         // 判断单团类型
         if (addMsg.GroupType == 2) {
@@ -1111,7 +1024,7 @@
       },
       changeBuy(info) {
         console.log('changeBuy', info)
-        if(!info) {
+        if (!info) {
           this.showBuy = false
         } else {
           this.saveOrder(info)

src/router/config.js

@@ -2301,7 +2301,7 @@ export default {
                 title: '团控列表'
               },
             }, {
-              path: '/priceGroup', //订单列表
+              path: '/priceGroup', //包机产品
               name: 'priceGroup',
               component: resolve => require(['@/components/TravelManager/TravelTeam/priceGroup'], resolve),
               meta: {