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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -520,7 +520,7 @@ tr._item_list td:last-child {
                 <el-option value="3" v-if="isShowType" label="单办签证"></el-option>
                 <el-option value="2" label="国际机票"></el-option>
                 <el-option value="4" label="国内票务"></el-option>
-                <el-option value="5" v-if="isShowType" label="散卖机票"></el-option>
+                <!-- <el-option value="5" v-if="isShowType" label="散卖机票"></el-option> -->
                 <el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
                 <el-option value="12" v-if="isShowType" label="日本地接部专户(人民币)"></el-option>
                 <el-option value="7" v-if="isShowType" label="老挝地接部专户"></el-option>
@@ -529,6 +529,7 @@ tr._item_list td:last-child {
                 <el-option value="10" v-if="isShowType" label="景点门票"></el-option>
                 <el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
                 <el-option value="13" label="机票折让收入"></el-option>
+                <el-option value="14" label="单机票收入"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -664,6 +665,7 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===9">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===10">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===11">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===14" @click="goSAirRec('TicketManager',rowData)">{{rowData.TCID}}</span>
   </div>
   
   `,
@@ -704,6 +706,7 @@ Vue.component("TCNUMJump", {
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===12" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">机票折让{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===14" @click="goSAirRec('TicketManager',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10">{{rowData.TCNUM}}</span>
@@ -756,6 +759,13 @@ Vue.component("TCNUMJump", {
         query: {'air':'air','StartDate':StartDate,"BankID":17,blank: "y"}
       });
 
+    },
+    goSAirRec(path,rowData){
+      this.$router.push({
+        path: "/" + path,
+        query: {'id':rowData.TCID,blank: "y"}
+      });
+
     },
     goUrl(path, id) {
       this.$router.push({

src/components/SalesModule/CouponsList.vue

@@ -125,9 +125,9 @@
     font-size: 12px;
     color: #333333;
     font-weight: bold;
-    margin-bottom: 13px;
+    margin-bottom: 5px!important;
     }
-    .MyCoupon ._item ._bottom p._bottom_info{
+    .MyCoupon ._item ._bottom p._bottom_info{                                 
     color: #666666;
     font-weight: 300;
     }

src/components/SalesModule/MyCustomer.vue

@@ -52,7 +52,7 @@
     background: #fff;
     padding-top: 20px;
     box-sizing: border-box;
-    overflow: hidden;
+    overflow: hidden!important;
     
   }
 
@@ -378,7 +378,7 @@
         <th>操作</th>
         
       </tr>
-      <tr v-for="(item,i) in dataList" :key="i">
+      <tr @click="goUrl(type,item.customerId)" v-for="(item,i) in dataList" :key="i">
         <td>{{item.contact}}</td>
         <td>{{item.contactNumber}}</td>
         <td>{{item.customerName}}</td>
@@ -409,7 +409,7 @@
         </td>
       </tr>
       <tr v-if="dataList.length==0">
-        <td colspan="12" align="center">暂无数据</td>
+        <td colspan="12" style="text-align:center">暂无数据</td>
       </tr>
     </table>
       <!-- <ul class="clearfix">

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -188,7 +188,7 @@
           </td>
           <td>{{item.InOut}}</td>
           <td>{{item.InOutTime}}</td>
-          <td>{{item.B2CMemberPrice}}</td>
+          <td>{{item.B2BMemberPrice}}</td>
           <td>{{item.TotalSeat}}</td>
           <td>
             <span title="点击跳转到报名清单" class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}" @click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}