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

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -53,8 +53,10 @@
                   <tr>
                     <td colspan="2">
                       <span style="padding-left:5px;" class="link"
-                        @click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}}</span>
-
+                        @click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}}
+                         <br/>
+                         真实名称: {{subItem.DiningRealName}}
+                        </span>
                     </td>
                   </tr>
                   <tr>
@@ -82,7 +84,7 @@
                   <el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
                     :key='itemHotel.ID'></el-option>
                 </el-select>
-                <span style="color:green">{{subItem.NewDiningName}}</span><br/>
+                <span style="color:green">{{subItem.NewDiningRealName}}</span><br/>
                 <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
                   <comCheckDinner :ref="'comCheckDinner'+index+subIndex+''" :UseDate="item.UseTimeStr"
                     v-on:childDinner="childDinnerList">
@@ -261,6 +263,7 @@
         oldData.PayStyleExt = obj.PayStyle;
         oldData.NewDiningID = obj.ID;
         oldData.NewDiningName = obj.Name;
+        oldData.NewDiningRealName=obj.RealName;
         this.list.forEach(x => {
           x.DiningSummaryList.forEach(y => {
             y.isShowPop = false;

src/components/SalesModule/groupTourOrder.vue

@@ -1390,7 +1390,7 @@
                 </td>
                 <td width="70">报名类型</td>
                 <td>
-                  <el-select v-model='msg.GroupType' filterable :placeholder="$t('pub.pleaseSel')">
+                  <el-select v-model='msg.GroupTypeArray' filterable multiple :placeholder="$t('pub.pleaseSel')">
                     <el-option label="不限" value='-1'></el-option>
                     <el-option v-for="item in ctlxList" :label='item.Name' :value='item.Id' :key='item.Id'>
                     </el-option>
@@ -2189,6 +2189,7 @@
           ContactName: '',
           CustomerId: '-1',
           GroupType: '-1',
+          GroupTypeArray:[],
           OrderSource: '-1',
           CStartDate: '',
           CEndDate: '',
@@ -3927,12 +3928,10 @@
           'sellorder_post_GetTravelOrderList',
           this.msg,
           res => {
-
             if (res.data.resultCode == 1) {
               this.loading = false
               this.total = res.data.data.count
               this.list = res.data.data.pageData;
-              console.log(this.list,'list');
             } else {
               this.$message.error(res.data.message)
             }

src/components/commonPage/comCheckDinner.vue

@@ -74,7 +74,7 @@
           <div class="clearfix comCheckDinner">
               <div class="comCk_list" v-for="(subItem,subIndex) in item.DinnerList">
                 <input :id="'H'+index+'_'+subIndex" type="checkbox" v-model="subItem.isChecked" @click="getDinner(item.DinnerList,subIndex)"/>
-                <label :for="'H'+index+'_'+subIndex" style="cursor: pointer">{{subItem.Name}}</label>
+                <label :for="'H'+index+'_'+subIndex" style="cursor: pointer">{{subItem.RealName}}</label>
               </div>
           </div>
         </el-tab-pane>
@@ -143,6 +143,7 @@
             ckDinnerObj.ID = this.ckedDinner.ID;
             ckDinnerObj.Address = this.ckedDinner.Address;
             ckDinnerObj.Name = this.ckedDinner.Name;
+            ckDinnerObj.RealName=this.ckedDinner.RealName;
             ckDinnerObj.PayStyle = this.ckedDinner.PayStyle;
             ckDinnerObj.Tel = this.ckedDinner.Tel;
             ckDinnerObj.RebateRatio=this.ckedDinner.RebateRatio;

src/router/config.js

@@ -1928,16 +1928,16 @@ export default {
                                 title: '领队用款'
                             },
                         }, {
-                            path: '/TravelPassengerList', //旅客名单 可分房
-                            name: 'TravelPassengerList',
+                            path: '/TravelPassengerList2', //旅客名单 不能分房
+                            name: 'TravelPassengerList2',
                             component: resolve => require(['@/components/TravelManager/TravelList/TravelPassengerList2'], resolve),
                             meta: {
                                 title: '旅客名单'
                             },
                         },
                         {
-                            path: '/TravelPassengerList2', //旅客名单  不能分房
-                            name: 'TravelPassengerList2',
+                            path: '/TravelPassengerList', //旅客名单 可分房 
+                            name: 'TravelPassengerList',
                             component: resolve => require(['@/components/TravelManager/TravelList/TravelPassengerList'], resolve),
                             meta: {
                                 title: '旅客名单'