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

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -118,6 +118,7 @@
 				<th width="8%">平台税金</th>
 				<th width="8%">预计提成</th>
 				<th width="8%">报名日期</th>
+				<th width="8%">状态</th>
 				<th width="10%">操作</th>
 			</tr>
 			<tbody v-for='item in dataList'>
@@ -143,6 +144,7 @@
 					<span class="peopleNum">￥{{moneyFormat(item.commission)}}</span>
 				</td>
 				<td>{{item.createTime}}</td>
+				<td>{{item.visaOrderStatus==1?"正常":"取消"}}</td>
 				   <td class="groupTourOrderIcon">
 				   	<el-button-group>
 					    <el-tooltip   v-if="item.income<=0&&item.visaOrderStatus==1&&item.visaStatus==1" class="item" effect="dark" content="修改" placement="top-start">
@@ -162,7 +164,7 @@
 					   
 			</tr>
 			<tr>
-				<td colspan="11" class="RL_Order" style="height:40px;">
+				<td colspan="12" class="RL_Order" style="height:40px;">
 				<span class="VD-remarkTitle">名单:</span>
 				<span class="VD-redType VD-remarkCon" v-if="item.guestList.length>0">
 					<span v-for="(childItem) in item.guestList" style="margin-right:10px;">{{childItem.userName}}</span>
@@ -173,7 +175,7 @@
 				</td>
           </tr>
 			<tr>
-				<td colspan="7" class="groupTourOrder_remarks" style="height: 40px;">
+				<td colspan="8" class="groupTourOrder_remarks" style="height: 40px;">
 					<div>
 						<div>
 							<span class="VD-remarkTitle">备注：</span>
@@ -181,7 +183,7 @@
 						</div>
 					</div>
 				</td>
-					<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
+					<td colspan="8" class="groupTourOrder_tickets" style="height: 40px;">
 						<div>
 							<div>
 								<span>财务单据：</span>
@@ -197,7 +199,7 @@
 			</tr>
 			</tbody>
 			<tr v-show="dataList.length==0">
-					<td v-show="dataList.length==0" colspan="7" align="center">暂无数据</td>
+					<td v-show="dataList.length==0" colspan="12" align="center">暂无数据</td>
 			</tr>
 		</table>
      

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -217,7 +217,8 @@
                 </td>
                 <td style="font-size:14px;">
                     应收：{{item.Money}}
-                    <span class="TB_PayMoney">实收：{{item.PayMoney}}</span>
+                    <!-- <span class="TB_PayMoney">实收：{{item.PayMoney}}</span> -->
+                    <span class="TB_PayMoney">实收：{{item.Money}}</span>
                 </td>
                 <td>{{item.TradeDate}}</td>
                 <td>
@@ -265,7 +266,8 @@
                 </td>
                 <td style="font-size:14px;">
                     应付：{{item.Money}}
-                    <span class="TB_PayMoney">实付：{{item.PayMoney}}</span>
+                    <!-- <span class="TB_PayMoney">实付：{{item.PayMoney}}</span> -->
+                    <span class="TB_PayMoney">实付：{{item.Money}}</span>
                 </td>
                 <td>{{item.TradeDate}}</td>
                 <td>