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

src/components/Buying/GuestAccountList.vue

@@ -60,7 +60,7 @@
         <th>创建时间</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
-      <tr v-for="item in dataList">
+      <tr v-for="(item,index) in dataList" :key="index">
         <td>{{item.AccountName}}</td>
         <td>{{item.LoginAccount}}</td>
         <td>{{item.MobilePhone}}</td>
@@ -86,6 +86,10 @@
                 </el-button>
               </el-tooltip>
             </template>
+             <el-tooltip class="item" effect="dark" content="收货地址" placement="top">
+                <el-button type="primary" size="mini" icon="iconfont icon-beizhu" @click="GetAddressInfo(item.Id)">
+                </el-button>
+              </el-tooltip>
           </el-button-group>
         </td>
       </tr>
@@ -172,8 +176,11 @@
             }
           }, null);
         });
+      },
+      GetAddressInfo(Id)
+      {
+        this.$router.push({ name: "GuestAddressList",query:{blank: 'y',Id:Id} })
       }
     }
   };
-
 </script>

src/components/FinancialModule/OpComPersonDetails.vue

@@ -19,7 +19,7 @@
                         </el-select>
                    </span>
                </li>
-               <li>
+               <li v-if="msg.TrPerIods==0">
                    <span>
                        <em>员工</em>
                        <el-select  filterable v-model='msg.EmployeeId' >
@@ -116,6 +116,7 @@
                     PeriodsId:"",
                     TCID:"",
                     TCNUM:"",
+                    TrPerIods:0,
                     RB_Branch_Id:-1
                 },
                 DataList:[],
@@ -130,7 +131,7 @@
             this.msg.PeriodsId=this.$route.query.PeriodsId?this.$route.query.PeriodsId:this.msg.PeriodsId;
             this.msg.EmployeeId=this.$route.query.EmployeeId?Number(this.$route.query.EmployeeId):this.msg.EmployeeId;
             this.msg.RB_Branch_Id=this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):this.msg.RB_Branch_Id;
-            
+            this.msg.TrPerIods=this.$route.query.TrPerIods?Number(this.$route.query.TrPerIods):this.msg.TrPerIods;
         },
         mounted(){
             this.getCompany();

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -106,7 +106,7 @@
           <span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
             @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
           <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
-            @click="getCompanyCheck(item)">{{item.BName}}</span>
+            @click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
         </div>
         <ul>
           <li>
@@ -670,7 +670,7 @@
                           <th width="130" style="text-align:center;">{{$t('op.CenterPNR')}}</th>
                           <th width="100" style="text-align:center;">{{$t('op.Tickets')}}</th>
                         </tr>
-                        <tr v-for="subItem in item.TicketList">
+                        <tr v-for="(subItem,subIndex) in item.TicketList" :key="subIndex">
                           <td style="text-align:center;">{{subItem.BindNum}}</td>
                           <td style="text-align:center;">{{subItem.TicketNum}}</td>
                           <td style="text-align:center;">{{subItem.TicketPrice}}</td>
@@ -683,6 +683,14 @@
                         style="cursor:pointer;color:red;text-decoration: underline;">{{$t('op.FlightToNum')}}: {{item.TicketNum}}</span>
                     </el-popover>
                   </div>
+                  <div class="TC_SeatList">
+                     <template v-if="item.CanSellTicketNum>0">
+                       <span style="color:rgb(71, 191, 140)">可售散客机票&nbsp;<span style="color:red;font-size:12px;font-weight:700;">{{item.CanSellTicketNum}}</span>&nbsp;张
+                       </span>&nbsp;&nbsp;
+                      <a @click="closeAirticket(item.TCID)" style="cursor:pointer;color:red;text-decoration: underline;">关闭</a></template>
+                     <template v-if="item.CanSellTicketNum==0"><span style="color:red;">已关闭散客机票</span>&nbsp;&nbsp;
+                     <a @click="openAirticket(item.TCID)" style="cursor:pointer;color:rgb(71, 191, 140);text-decoration: underline;">开启</a></template>
+                  </div>
                 </div>
               </div>
               <div class="el-col" style="width:200px;">
@@ -840,9 +848,11 @@
                       <el-dropdown-item>
                         <div @click='exportExcel_singleRoom(item)'>{{$t('op.FFBDowmLoad')}} </div>
                       </el-dropdown-item>
+                      <el-dropdown-item>
+                        <div @click='goOPCommissionInfo(item.TCID)'>查看OP提成 </div>
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
-                  
                 </div>
               </div>
             </div>
@@ -1146,6 +1156,43 @@
       commonHotelInfo
     },
     methods: {
+      //开启散客机票
+      openAirticket(TCID)
+      {
+       var tempMsg = {
+          TCID: TCID,
+          CanSellTicketNum:2
+        };
+       this.apipost("travel_post_SetCanSellTicketNumService",tempMsg,
+            res => {
+                if (res.data.resultCode == 1) {
+                    this.Success('开启成功!');
+                    this.getControlList();
+                }else{
+                    this.Error(res.data.data);
+                }
+            },null);
+      },
+      //关闭散客机票
+      closeAirticket(TCID)
+      {
+        var that=this;
+        this.Confirm("是否要关闭可售机票?", function() {
+        var tempMsg = {
+          TCID: TCID,
+          CanSellTicketNum:0
+        };
+        that.apipost("travel_post_SetCanSellTicketNumService",tempMsg,
+            res => {
+                if (res.data.resultCode == 1) {
+                    that.Success('关闭成功!');
+                    that.getControlList();
+                }else{
+                    that.Error(res.data.data);
+                }
+            },null);
+        });
+      },
       // 跳转调查列表
       goInvetig: function (path, tcid, orderId) {
         this.$router.push({
@@ -1196,6 +1243,15 @@
         let reg = /^http(s)?:\/\/(.*?)\//
         this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name)
       },
+      goOPCommissionInfo(tcid){
+      this.$router.push({
+              path: "OpComPersonDetails",
+              query: {
+                TrPerIods: tcid,
+                blank:'y'
+              }
+            });
+      },
       //翻页
       handleCurrentChange(val) {
         this.queryMsg.pageIndex = val

src/components/dmc/manager/dmcTotalTable.vue

@@ -185,9 +185,9 @@
           <th width="60">{{$t('ground.ldrtf')}}</th>
           <th width="120">{{$t('system.table_operation')}}</th>
         </tr>
-        <tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}">
+        <tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}" :key="outindex">
           <template v-for="(item,index) in outItem.PriceCommonList">
-            <tr>
+            <tr :key="index">
               <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
                 {{outItem.NewCombinationNum}}
               </td>
@@ -380,7 +380,7 @@
                       <th>{{$t('fnc.danhao')}}</th>
                       <th>{{$t('fnc.jine')}}</th>
                     </tr>
-                    <tr v-for="(fnc, findex) in outItem.FinanceIds">
+                    <tr v-for="(fnc, findex) in outItem.FinanceIds" :key="findex">
                       <td class="cursorpointer text-decoration"
                         @click="goFncUrl('FinancialDocumentsDetail', fnc.FinanceId)">{{fnc.FinanceId}}</td>
                       <td>{{moneyFormat(fnc.OriginalMoney)}}</td>
@@ -499,7 +499,7 @@
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr :key="index+100">
               <td colspan="23" style="text-align: left!important;padding:0 20px;">
                 <div class="link">
                   <p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>

src/router/config.js

@@ -4004,6 +4004,14 @@ export default {
                                 title: '账户管理'
                             }
                         },
+                        {
+                            path: '/GuestAddressList',
+                            name: 'GuestAddressList',
+                            component: resolve => require(['@/components/Buying/GuestAddressList'], resolve),
+                            meta: {
+                                title: '收货地址管理'
+                            }
+                        },
                         {
                             path: '/CommondityOrderList',
                             name: 'CommondityOrderList',