'提成显示@'

src/components/SalesModule/enrollTotal.vue

@@ -178,6 +178,7 @@
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
             <p>发团：{{item.startDate}}</p>
+            <p v-if='item.commissionMoney'>提成：{{item.commissionMoney}}</p>
           </td>
           <td>
             <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>

src/components/SalesModule/groupTourOrder.vue

@@ -1222,6 +1222,7 @@
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
             <p style="min-width: 180px;">发团：{{item.startDate}}</p>
             <p>下单时间：{{item.createDate}}</p>
+            <p v-if='item.commissionMoney'>提成：{{item.commissionMoney}}</p>
           </td>
           <td>
 						<p class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1378,7 +1378,7 @@
     <!-- 表格 -->
 		<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0">
 			<tr>
-				<th width="150">单号</th>
+				<th width="230">单号</th>
         <th width="100">客户信息</th>
 				<th width="100">人数/机位数</th>
         <th width="80">单价</th>
@@ -1419,6 +1419,7 @@
               <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
               <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12">{{item.contactMobile}}</p>
               <p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168&&isUpdateOrder==false'>*****</p>
+              <p v-if='item.commissionMoney'>提成：{{item.commissionMoney}}</p>
               <!-- <p class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
               <p class="fz12">{{item.contactMobile}}</p> -->
             </td>
@@ -1571,7 +1572,7 @@
                       <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
                       <div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div>
                       <!-- v-if="item.isUpdateOrderCommission" -->
-                      <div  @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="item.isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate, TiChengLoading = true'>修改提成</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'>
                         <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
                         <span v-else>设为收损单</span>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1334,7 +1334,7 @@
     <div style="width: 100%; height: auto;  overflow-x: auto;" class="ownScrollbarStyle">
       <table class="RegisTrationTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
         <tr>
-          <th width="240">单号</th>
+          <th width="260">单号</th>
           <th width="150">客户信息</th>
           <th width="70" class="nowrap">人数/机位数</th>
           <th width="110" class="nowrap">单价</th>
@@ -1366,7 +1366,6 @@
               <div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''" style="color:red">({{item.LeaveStr}})</span></div>
               <div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div>
               <p>下单时间：{{item.CreateDate}}</p>
-              
             </td>
             <td>
               <p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
@@ -1476,7 +1475,7 @@
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
-                      <div  @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="item.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
                       <div @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
@@ -1543,6 +1542,7 @@
                 <div class="RL_CreatInfo">关联销售：{{childItem.CommissionSPeopleName}}</div>
                 <!-- <p>发团：{{childItem.startDate}}</p> -->
                 <p>下单时间：{{childItem.CreateDate}}</p>
+                <p v-if='childItem.CommissionMoney'>提成：{{childItem.CmmissionMoney}}</p>
               </td>
               <td>
                 <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="childItem.ContactName">
@@ -1659,7 +1659,7 @@
                         <div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div>
                         <div @click="transfer(childItem)">订单转团</div>
                         <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId'>OP备注</div>
-                        <div  @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                        <div v-if="childItem.IsUpdateOrderCommission" @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
                         <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
                           @click='deleteItem(childItem)'>
                           删除
@@ -1878,7 +1878,7 @@
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
-                      <div  @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="item.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
                       <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'