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

src/components/SalesModule/planeTicketInquiry.vue

@@ -2258,7 +2258,7 @@
       getList() {
         this.loading = true;
         this.apipost(
-          "AirTicket_get_GetB2BAirTicketPageList",
+          "AirTicket_get_GetERPAirTicketPageList",
           this.msg,
           res => {
             this.loading = false;

src/components/SalesVisa/VisaProductOrder.vue

@@ -77,6 +77,9 @@
 	color: #000000;
 	text-decoration: underline;
 }
+.color_red{
+  color: #e95252 !important;
+}
 </style>
 <template>
     <div class="page_MyCustomer">
@@ -106,6 +109,12 @@
 				</li>
 			</ul>
     	</div>
+
+		<div style="    padding-bottom: 10px;">
+			<span>应收总额：{{moneyFormat(PreferPrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<span>实收：{{moneyFormat(IncomePrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<span>待收：<span :class="{color_red:(PreferPrice-IncomePrice)!==0}">{{moneyFormat(PreferPrice-IncomePrice)}}</span></span>
+		</div>
 			<table class="VisaProductTable"  border="0" cellspacing="0" cellpadding="0"  v-loading='loading'>
 			<tr>
 				<th width="10%">单号</th>
@@ -241,6 +250,8 @@ export default {
             total: 0,
 			currentPage: 1,
 			isShow:0,
+			PreferPrice:0,
+			IncomePrice:0
         }
     },methods:{
 		goUrlVisaList(obj){
@@ -276,6 +287,8 @@ export default {
     	},   
         getList(){  // 获取列表数据
             this.apipost('dmc_get_visa_GetVisaOrderList',this.msg,res=>{
+				this.PreferPrice=0;
+				this.IncomePrice=0;
                 if(res.data.resultCode==0){
                     this.loading = false;
                     this.dataList=[]
@@ -283,6 +296,10 @@ export default {
                     this.dataList = res.data.data.pageData;
                     this.total = res.data.data.count;
                     this.loading = false;
+					this.dataList.forEach(x=>{
+						this.PreferPrice+=x.TotalPrice;
+						this.IncomePrice+=x.Income;
+					})
                 }
             },err=>{})
 		},

src/components/Ticketing/TicketManager.vue

@@ -271,7 +271,7 @@
     height: 60px;
     background-color: #f9f9f9;
     margin-top: 9px;
-    padding-right: 10px;
+    padding-right: 3px;
   }
 
   .TK_SeatList > ul > li:nth-child(1) {
@@ -281,7 +281,7 @@
   .TK_SeatList > ul > li {
     float: left;
     text-align: center;
-    margin: 5px 10px 0 0;
+    margin: 5px 4px 0 0;
   }
 
   .TK_SeatList > ul > li:last-child {
@@ -1223,7 +1223,7 @@
   }
 
   .TK_raduis ul li {
-    margin-right: 12px;
+    margin-left: 12px;
     float: left;
   }
 
@@ -1461,6 +1461,10 @@
                         <p class="_num3">{{item.UseScatterNum}}/{{item.AirTicketScatterNum }}</p>
                         <p class="_wz">已卖/总数</p>
                       </li>
+                      <li>
+                        <p class="_num3">{{item.SurplusNum}}</p>
+                        <p class="_wz">可散卖</p>
+                      </li>
                       <li>
                         <p class="_num3">{{item.OutTicketPercent}} %</p>
                         <p class="_wz">出票百分比</p>
@@ -2052,17 +2056,17 @@
         <ul class="clearfix">
           <el-col :span="5">
             <el-form-item label="人数" prop="AirTicketNum">
-                <el-input v-model="sales.AirTicketNum" @keyup.native="checkInteger(sales,'AirTicketScatterNum')"></el-input>
+                <el-input v-model="sales.AirTicketNum" @keyup.native="checkInteger(sales,'AirTicketNum')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="B2B单价" prop="B2BPrice">
-                <el-input v-model="sales.B2BPrice" @keyup.native="checkPrice(sales,'ScatterB2BPrice')"></el-input>
+                <el-input v-model="sales.B2BPrice" @keyup.native="checkPrice(sales,'B2BPrice')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="B2C单价" prop="B2CPrice">
-                <el-input v-model="sales.B2CPrice" @keyup.native="checkPrice(sales,'ScatterB2CPrice')"></el-input>
+                <el-input v-model="sales.B2CPrice" @keyup.native="checkPrice(sales,'B2CPrice')"></el-input>
             </el-form-item>
           </el-col>
         </ul>

src/components/confirmationOrderDownLoad.vue

@@ -922,7 +922,7 @@
           isShowFee:this.vshowE?1:0,
           //购物说明，购物安排
           isShowShop:this.vshowF?1:0,
-          //重要提示、温馨提示
+          //重要提示、温馨提示 [订单须知]
           isShowTip:this.vshowG?1:0,
           //是否显示同行备注
           isShowB2B:this.vshowI?1:0,
@@ -938,6 +938,8 @@
           isShowTCNUM:this.vshowTCNUM?1:0,
           //是否显示行程图片
           isShowTripImage:this.vshowK?1:0,
+          //是否显示签证信息
+          isShowVisa:this.vshowH?1:0,
           //isPc是否PC下载
           isPc: isPc,
         };

src/components/systemManagement/LessPriceManagement.vue

@@ -59,7 +59,7 @@
   }
   .comLessDiv{
     width:100%;
-    /* height:40px; */
+    height:40px;
     margin-top:5px;
     padding-bottom:5px;
     border-bottom:1px solid #d1d1d1;