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

src/components/SalesModule/groupInquiry.vue

@@ -466,6 +466,10 @@
                               <div class="TCL_remarkTitle">OP对内备注：</div>
                               <div class="TCL_Content">{{item.OPInnerRemark}}</div>
                           </div>
+                          <div class="clearfix TCL-redType TCL-Opremark">
+                              <div class="TCL_remarkTitle">地接备注：</div>
+                              <div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div>
+                          </div>
                       </div>
           </li>
         </ul>

src/components/SalesModule/planeTourOrder.vue

@@ -1083,7 +1083,7 @@
 						</p>
 					</div>
 				</el-col>
-				<el-col :span="5" class="groupTourOrder_count_col">
+				<el-col :span="4" class="groupTourOrder_count_col">
 					<div class="groupTourOrder_count_item">
 						<div class="groupTourOrder_count_blue">
 							<i class="iconfont icon-baomingrenshu"></i>
@@ -1097,7 +1097,7 @@
 						</p>
 					</div>
 				</el-col>
-				<el-col :span="5" class="groupTourOrder_count_col">
+				<el-col :span="4" class="groupTourOrder_count_col">
 					<div class="groupTourOrder_count_item">
 						<div class="groupTourOrder_count_yellow">
 							<i class="iconfont icon-baomingrenshu"></i>
@@ -1123,7 +1123,7 @@
             </p>
 					</div>
 				</el-col>
-        <el-col :span="5" class="groupTourOrder_count_col">
+        <el-col :span="4" class="groupTourOrder_count_col">
             <div class="groupTourOrder_count_item">
 						<div>
 							<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
@@ -1135,6 +1135,17 @@
               <span class="groupTourOrderByTuan_ico"><i style="background-color:#ff0000"></i><span>未审核</span></span>
             </p>
 					</div>
+        </el-col>
+        <el-col :span="3" class="groupTourOrder_count_col">
+          <div class="groupTourOrder_count_item">
+            <div>
+              <i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
+              <span>累计提成</span>
+            </div>
+            <p>
+              <span>提成金额：{{countData.SumCommissionMoney}};</span>
+            </p>
+          </div>
         </el-col>
 			</el-row>
 		</div>
@@ -1166,6 +1177,8 @@
 						<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
 						<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" @click="goUrlX('产品查询','productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
+            <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+            <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
           </td>
           <td>
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>

src/components/index.vue

@@ -104,7 +104,7 @@
                       <i class="iconfont icon-menu-shezhi"></i>
                       设置
                     </el-dropdown-item> -->
-                    <el-dropdown-item class="clearfix _dropdown_other" @click. ="exit">
+                    <el-dropdown-item class="clearfix _dropdown_other" @click.native ="exit">
                       <i class="iconfont icon-menu-tuichu"></i>
                       退出
                     </el-dropdown-item>