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

src/components/FinancialModule/groupApproval.vue

@@ -41,6 +41,9 @@
             <div style="float: right;" v-if="multipleSelection.length>0">
                 <button class="hollowFixedBtn" @click="setAudit()">批量审核</button>
             </div>
+            <li style="float: right;color: red;font-size: 14px;">
+                注：落地团，小包团，国内线 均按订单利润的20%计算最大预计销售提成，实际发放提成不会超过最大预期销售提成
+            </li>
         </ul>
 
         <ul style="overflow: initial!important">
@@ -64,24 +67,34 @@
                 label="团队编号"
                 width="170">
                     <template slot-scope="scope">
+                        <p>{{scope.row.OutBranchName}}</p>
                         <span style="cursor: pointer;text-decoration: underline;" 
                         @click="goTravel(scope.row.TCID)">{{scope.row.TCNUM}}({{scope.row.TCID}})</span>
                     </template>
                 </el-table-column>
                 <el-table-column
                 prop="LtName"
-                label="系列" show-overflow-tooltip></el-table-column>
+                label="系列" show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <p>{{scope.row.LineName}}</p>
+                    <p>{{scope.row.LtName}}</p>
+                </template>
+                </el-table-column>
                 <el-table-column
                 prop="Title"
                 label="团名"
-                width="400"
+                width="200"
                 show-overflow-tooltip></el-table-column>
                 <el-table-column
                 prop="OPName"
                 label="OP"></el-table-column>
                 <el-table-column
                 prop="PriceTeamTypeName"
-                label="团队类型"></el-table-column>
+                label="团队类型">
+                <template slot-scope="scope">
+                    <template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}/</template>{{scope.row.PriceTeamTypeName}}
+                </template>
+                </el-table-column>
                 <el-table-column
                 prop="ShouldReceive"
                 label="应收"></el-table-column>
@@ -105,7 +118,7 @@
                 label="团队利润"></el-table-column>
                 <el-table-column
                 prop="SaleCommission"
-                label="预计销售提成">
+                label="预计销售提成" width="130px">
                     <template slot-scope="scope">
                         {{scope.row.SaleCommission}}
                     </template>
@@ -319,7 +332,7 @@
                     msg.TCID = 0
                 }
                 this.apipost(
-                    "travel_get_GetOutGroupAuditPageList",
+                    "travel_get_GetOutGroupAuditPageListNew",
                     msg,
                     res => {
                         this.loading = false