Merge branch 'master' into month

src/App.vue

@@ -322,4 +322,11 @@
   .cursor-p.active{
     color: #409EFF;
   }
+  .float-l{
+    float: left;
+  }
+  .width100-float-l{
+    width: 100%;
+    float: left;
+  }
 </style>

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -212,7 +212,8 @@
             EmployeeId: -1,
             PeriodsId: -1,
             OrderType: -1,
-            Way: -1,
+            Way: '-1',
+            TCID: '',
             TCNUM: '',
             RB_Department_Id: -1,//部门ID
             EmBranchId: -1,//公司ID
@@ -267,7 +268,6 @@
           this.getDepartment()
           this.getCompany()
           this.GetOrderTypeEnumList()
-          this.GetCommissionPeroidsList()//期数
       },
       mounted() {
         let userInfo = this.getLocalStorage();
@@ -285,7 +285,6 @@
           }
         }
         this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
-        this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
         this.msg.RB_Branch_Id = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
         this.msg.EmBranchId = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
         this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
@@ -482,9 +481,7 @@
                 "opcommission_GetNewOPCommissionPeroidsList",{},res => {
                 if (res.data.resultCode == 1) {
                     this.PeroidsList = res.data.data;
-                    if(!this.$route.query.PeriodId){
-                      this.msg.PeriodsId = this.PeroidsList[0].Id
-                    }
+                    this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):this.PeroidsList[0].ID
                     this.getList()
                 } else {
                     this.Error(res.data.message);

src/components/FinancialModule/ServiceCommission/ServiceCommissionUser.vue

@@ -164,9 +164,7 @@
                   this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
                 }
             }
-            if (this.$route.query && this.$route.query.PeriodId) {
-                this.msg.PeriodId = this.$route.query.PeriodId
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getqishilist()
             this.getCompanyList()//获取公司
             this.getEmployee()//人员

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -345,7 +345,6 @@
             // });
       },
         clickUrl(row,type){
-          console.log(row.OrderType,'----')
           let data = [{
           path: "",
           OrderId: row.OrderId,

src/components/FinancialModule/TradeCommission/commissionDialog.vue

@@ -21,13 +21,18 @@
 <template>
     <div style="float: left;">
         <span class="cF1416C"
-        :class="{'cursor-pointer':!type||(type=='跟团游订单'&&objNew.startDate&&objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))}" 
-        @click="!type||(type=='跟团游订单'&&objNew.startDate&&objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))
+        :class="{'cursor-pointer':!type||(type=='跟团游订单'&&
+        objNew.startDate&&
+        objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))}"
+        @click="!type||(type=='跟团游订单'&&
+        objNew.startDate&&
+        objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))
         ||objNew.createDate
         ||objNew.CreateTime?DetailsOfRoyalty():''">
             <span class="fz15 fbold">
               <!-- {{objNew.commissionCurrency?objNew.commissionCurrency:objNew.CurrencyName!='人民币'?objNew.CurrencyName:'￥'}} -->
-              {{ objNew.commissionMoney?moneyFormat(objNew.commissionMoney):objNew.SellCommission }} 
+              <template v-if="OP">{{ moneyFormat(objNew.OPCommission) }} </template>
+              <template v-else>{{ objNew.commissionMoney?moneyFormat(objNew.commissionMoney):objNew.SellCommission }}</template>
               </span>
         </span>
     <el-dialog width="1000px" title="提成详情" :visible.sync="outerVisible" center>
@@ -54,19 +59,14 @@
                 <tr>
                     <th style="width: 100px;">出团公司</th>
                     <th style="width: 80px;">类型</th>
-                    <th style="width: 80px;">订单号</th>
+                    <th style="width: 80px;">{{OP?'团/订单':'订单号'}}</th>
                     <th style="width: 150px;">团号</th>
-                    <!-- <th style="width: 100px;">所属公司</th> -->
-                    <!-- <th style="width: 100px;">部门</th> -->
                     <th style="width: 100px;">姓名</th>
-                    <!-- <th style="width: 100px;">线路</th> -->
-                    <!-- <th style="width: 100px;">是否欧洲订单</th> -->
-                    <th style="width: 100px;">订单人数</th>
-                    <!-- <th style="width: 100px;">团队总人数</th> -->
+                    <th style="width: 100px;">{{OP?'':'订单'}}人数</th>
                     <th style="width: 100px;">提成方式</th>
                     <th style="width: 100px;">提成比例</th>
-                    <th style="width: 100px;">当月利润</th>
-                    <th style="width: 100px;">团队利润</th>
+                    <th style="width: 100px;" v-if="!OP">当月利润</th>
+                    <th style="width: 100px;">{{OP?'':'团队'}}利润</th>
                     <th style="width: 100px;">提成金额</th>
                     <th style="width: 100px;">期数</th>
                     <th width='200'>备注</th>
@@ -76,30 +76,32 @@
                     :key="index">
                     <td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
                     <td>{{item.OrderTypeName}}</td>
-                    <td>{{item.OrderId}}</td>
-                    <td><span v-if="item.TCNUM">{{item.TCNUM}}({{item.TCID}})</span></td>
-                    <!-- <td>{{item.BranchName?item.BranchName:'-'}}</td> -->
-                    <!-- <td>{{item.DeptName?item.DeptName:'-'}}</td> -->
+                    <td>{{OP?item.TCID:item.OrderId}}</td>
+                    <td><span v-if="item.TCNUM">{{item.TCNUM}}<template v-if="!OP">({{item.TCID}})</template> </span></td>
                     <td>{{item.UserName}}</td>
-                    <!-- <td>{{item.LineName}}</td> -->
-                    <!-- <td>{{item.IsEurope==1?'是':'否'}}</td> -->
-                    <td>{{item.PeopleNum}}</td>
-                    <!-- <td>{{item.TCGuestNum}}</td> -->
-                    <td>{{item.Way==1?'销售额':'利润比'}}</td>
-                    <td>{{item.Rate?item.Rate+'%':'-'}}</td>
-                    <td>{{item.OrderProfit}}</td>
+                    <td>{{OP?item.PeopleCount:item.PeopleNum}}</td>
+                    <td>
+                      <template v-if="OP">{{item.Way==1?'人头奖励':'利润比例'}}</template>
+                      <template>{{item.Way==1?'销售额':'利润比'}}</template>
+                    </td>
+                    <td>
+                      <template v-if="OP">
+                        {{item.Rate&&item.Way==2?item.Rate+'%':item.Rate&&item.Way==1?item.Rate+'/人':'-'}}
+                      </template>
+                      <template v-else>
+                        {{item.Rate?item.Rate+'%':'-'}}
+                      </template>
+                    </td>
+                    <td v-if="!OP">{{item.OrderProfit}}</td>
                     <td>{{item.TCProfit}}</td>
                     <td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
-                    <td>{{item.Periods}}</td>
+                    <td>{{OP?item.PeriodsReissue:item.Periods}}</td>
                     <td>{{item.Description?item.Description:'-'}}</td>
                 </tr>
                 <tr v-if="dataList.length==0">
                     <td style="text-align:center" colspan="13">暂无数据</td>
                 </tr>
                 </table>
-                <!-- <div v-if="dataList.length==0"
-                    style="width: 100%;border:1px solid #fff;display: flex;align-items: center;justify-content: center;height: 60px;margin-top: 30px;"
-                >暂无数据</div> -->
                 <!-- 分页 -->
                 <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
                 layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
@@ -117,7 +119,7 @@
 
 <script>
     export default {
-        props:['objNew','type'],
+        props:['objNew','type','OP'],
         data() {
             return {
                 dataObj:{},
@@ -142,6 +144,7 @@
         watch:{
             objNew: {
                 handler(val, oldVal) {
+                    this.objNew = val
                     this.msg.OrderId = val.id?val.id:val.OrderId?val.OrderId:val.orderId
                     this.msg.PeriodId = this.$route.query.PeriodId?this.$route.query.PeriodId:-1
                 },
@@ -155,8 +158,14 @@
         methods: {
             goUrl(){
                 this.outerVisible = false
+                let name
+                if(this.OP){
+                  name = 'OpComPersonDetails'
+                }else{
+                  name = 'TradeTicketUserDetails'
+                }
                 this.$router.push({
-                    path: 'TradeTicketUserDetails',
+                    path: name,
                     query: {
                         blank: 'y',
                         tab: '提成明细'
@@ -170,6 +179,14 @@
             // 获取员工生成比例
             getList(){
                 this.loading = true
+                if(!this.OP){
+                  this.GetTYSaleCommission()
+                }else{
+                  this.GetNewOPCommission()
+                }
+            },
+            // 销售提成
+            GetTYSaleCommission(){
             this.apipost("sellcommission_GetTYSaleCommissionSingleDetailsList",this.msg,res => {
                   if (res.data.resultCode == 1) {
                       this.loading = false
@@ -183,6 +200,39 @@
                   }
               );
           },
+          // op提成
+          GetNewOPCommission(){
+            let msg = {
+              pageIndex: 1,
+              pageSize: 5,
+              EmployeeId: -1,
+              PeriodsId: -1,
+              OrderType: -1,
+              Way: -1,
+              TCID: this.objNew.OrderId,
+              TCNUM: '',
+              RB_Department_Id: -1,//部门ID
+              EmBranchId: -1,//公司ID
+              RB_Branch_Id: -1,//出团公司ID
+            }
+            if (msg.TCID == '') {
+              msg.TCID = 0
+            }
+            this.apipost(
+              "opcommission_GetNewOPCommissionDetailsPageList",
+              msg,
+              res => {
+                this.loading = false;
+                if (res.data.resultCode == 1) {
+                  this.dataObj = res.data.data
+                  this.dataList = res.data.data.pmodel.pageData;
+                  this.total = res.data.data.pmodel.count;
+                } else {
+                  this.Error(res.data.message);
+                }
+              }
+            );
+          },
         handleCurrentChange(val) {
             this.msg.pageIndex = val;
             this.getList();

src/components/FinancialModule/domestic/OPsalesCommissionUser.vue

@@ -140,9 +140,7 @@
                 this.disabled = true;
                 this.msg.UserId = Number(userInfo.EmployeeId)
             }
-            if (this.$route.query && this.$route.query.PeriodId) {
-                this.msg.PeriodId = this.$route.query.PeriodId
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getList();
             // this.getqishilist()
             this.getCompanyList()//获取公司

src/components/FinancialModule/domesticCommissionUser.vue

@@ -160,9 +160,7 @@
                   this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
                 }
             }
-            if (this.$route.query && this.$route.query.PeriodId) {
-                this.msg.PeriodId = this.$route.query.PeriodId
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getqishilist()
 
             this.getCompanyList()//获取公司

src/components/FinancialModule/domesticCommissionUserTW.vue

@@ -142,9 +142,7 @@
                 this.disabled = true;
                 this.msg.UserId = Number(userInfo.EmployeeId)
             }
-            if (this.$route.query && this.$route.query.PeriodId) {
-                this.msg.PeriodId = this.$route.query.PeriodId
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getList();
             // this.getqishilist()
             this.getCompanyList()//获取公司

src/components/FinancialModule/domesticCommissionUserTW2.vue

@@ -160,9 +160,7 @@
                 this.S_CheckBranchOrder = true
                 this.msg.OutBranchId = userInfo.RB_Branch_id
             }
-            if (this.$route.query && this.$route.query.PeriodId) {
-                this.msg.PeriodId = this.$route.query.PeriodId
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             if (this.$route.query && this.$route.query.OutBranchId) {
                 this.msg.OutBranchId = this.$route.query.OutBranchId
             }

src/components/Hotel/reservation/OrderList.vue

@@ -535,9 +535,14 @@
             <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
+        <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
           <template slot-scope="scope">
-            <commissionDialog :objNew="item"></commissionDialog>
+            <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
+              <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+            </div>
+            <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
+              <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+            </div>
           </template>
         </el-table-column>
       </el-table>

src/components/SalesModule/groupTourOrderOne.vue

@@ -1467,9 +1467,16 @@
               <p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
               <p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
               <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
-              <p v-if='item.commissionMoney' style="color:red">
-                <span style="float: left;">{{$t('salesModule.Commission')}}：</span>
-                <commissionDialog :objNew="item"></commissionDialog>
+              <p v-if='(item.commissionMoney&&item.commissionMoney>0)||(item.opcommission&&item.opcommission>0)' style="color:red">
+                <template v-if="item.commissionMoney&&item.commissionMoney>0">
+                  <span style="float: left;">销售{{$t('salesModule.Commission')}}：</span>
+                  <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+                </template>
+                <template v-if="item.opcommission&&item.opcommission>0">
+                  <span style="float: left; margin-left: 10px;">OP提成：</span>
+                  <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+                </template>
+
                 <!-- {{item.commissionMoney}} -->
               </p>
               <p v-else-if="item.latestCommissionMoney" style="color:red">

src/components/SalesModule/productOrderList.vue

@@ -407,8 +407,9 @@
       },
       // 线路
       getLineList() {
-        this.apipost("line_post_GetAllList_V2", {
-          LineDirection: 0
+        // LineDirection: 0
+        this.apipost("line_post_GetAllList_V3", {
+          IsShow: -1
         }, (res) => {
           if (res.data.resultCode == 1) {
             this.LineList = res.data.data;

src/components/SalesVisa/components/visaOrderList.vue

@@ -610,10 +610,17 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column v-if="item.commissionMoney&&item.commissionMoney>0" label="提成" style="background:#EAEAEA">
+          <el-table-column label="提成" style="background:#EAEAEA"
+          v-if="(item.commissionMoney&&item.commissionMoney>0)||(item.opCommission&&item.opCommission>0)">
             <template slot-scope="scope">
-              <span class="cF1416C" style="float: left;">￥</span>
-              <commissionDialog :objNew="scope.row"></commissionDialog>
+              <div class="width100-float-l" v-if="item.commissionMoney&&item.commissionMoney>0">
+                <span class="float-l">销售：<span class="cF1416C">￥</span></span>
+                <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
+              </div>
+              <div class="width100-float-l" v-if="item.opCommission&&item.opCommission>0">
+                <span class="float-l">OP：<span class="cF1416C">￥</span></span>
+                <commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
+              </div>
             </template>
           </el-table-column>
           <template slot="append" >

src/components/SingleAirTicket/components/OrderList.vue

@@ -603,9 +603,16 @@
                     <span :class="{'cF1416C':scope.row.DueinMoney>0}">{{ scope.row.DueinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
+                <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
                   <template slot-scope="scope">
-                    <commissionDialog :objNew="scope.row"></commissionDialog>
+                    <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0">
+                      <span class="float-l">销售：</span>
+                      <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
+                    </div>
+                    <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0">
+                      <span class="float-l">OP：</span>
+                      <commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="出票状态" style="background:#EAEAEA">
@@ -1440,4 +1447,3 @@
     </script>
 
     <style></style>
-    
\ No newline at end of file

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -637,7 +637,7 @@
                     </el-dropdown-menu>
                   </el-dropdown>
                   <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
-                    style="background:#67c23a; border-color:#67c23a;display:none;">广告&nbsp;{{item.AdvertCount}}
+                    style="background:#67c23a; border-color:#67c23a;">广告&nbsp;{{item.AdvertCount}}
                   </el-button>
                   <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
                     {{$t('Operation.Op_remark')}}

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -250,7 +250,10 @@
                 </el-tooltip>
                 开
               </span>
-              <span class="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item.ID, item.TeamType)">
+
+              <span class="bianji newAopbdd"
+                v-if="item.TravelState==1||item.TravelState==2||item.TravelState==4||item.TravelState==5"
+                @click="goMakeQuo('QuotationNewPrice',item.ID, item.TeamType)">
                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
                   popper-class="max-w250">
                   <i class="iconfont icon-bianji-smal"></i>

src/components/busManagement/BookAcar/components/orderList.vue

@@ -663,12 +663,17 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="item.SellCommission && item.SellCommission > 0"
+          v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)"
           label="提成"
           style="background: #eaeaea"
         >
           <template slot-scope="scope">
-            <commissionDialog :objNew="item"></commissionDialog>
+            <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
+              <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+            </div>
+            <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
+              <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -1612,4 +1617,3 @@ export default {
 </script>
 
     <style></style>
-    
\ No newline at end of file

src/components/myOrdersAllType/components/allList.vue

@@ -615,8 +615,8 @@
 
           let userInfo=this.getLocalStorage();
           this.employeeMsg.GroupId = userInfo.RB_Group_id;    //集团ID
-          this.msg.EnterId = this.$route.query.EnterId?this.$route.query.EnterId:0//userInfo.EmployeeId;
-          this.msg.LureEmpId = this.$route.query.LureEmpId?this.$route.query.LureEmpId:0
+          this.msg.EnterId = this.$route.query.EnterId?Number(this.$route.query.EnterId):0//userInfo.EmployeeId;
+          this.msg.LureEmpId = this.$route.query.LureEmpId?Number(this.$route.query.LureEmpId):0
           this.msg.StartTime = this.getBeforeDate(0, new Date())
           this.msg.EndTime = this.getBeforeDate(0, new Date())
           this.DatelistBM = [new Date(this.msg.StartTime),new Date()]

src/components/sale/ExpectedCommission.vue

@@ -242,7 +242,7 @@
               </div>
             </div>
           </div>
-          <div style="display: flex;">
+          <div style="display: flex;" v-if="isAnnualBonus">
             <div class="CommissionLadder Line" style="margin: 0;">
               <div style="display: flex;justify-content: space-between;">
                <span>年终奖(不含门票、包车、国内游)</span>
@@ -498,12 +498,21 @@
           IsSelectCRM: 0,//1来源crm
           IsMyOrder: 1,//1我的订单
         },
+        isAnnualBonus: false,// 年终奖权限
       };
     },
     mounted() {
       this.getList()
     },
     created() {
+      let userInfo = this.getLocalStorage();
+      // 年终奖权限 销售，  引流， 市场， 票务 ， 票務，总经理，总经理
+      if(userInfo.PostName.indexOf('销售')||userInfo.PostName.indexOf('引流')||
+      userInfo.PostName.indexOf('市场，')||userInfo.PostName.indexOf('票务')||
+      userInfo.PostName.indexOf('票務')||userInfo.PostName.indexOf('总经理')||
+      userInfo.PostName.indexOf('总经理')){
+        this.isAnnualBonus = true
+      }
       let nowdays = new Date()
       this.Year = new Date().getFullYear()
       this.LastMonthTime = new Date().getMonth()

src/components/sale/sale.vue

@@ -121,7 +121,7 @@
                     </div>
                     <el-tooltip class="item" effect="dark" content="预期提成" placement="top">
                       <img src="../../assets/img/xiaosouYQ.png" @click="goAnticipate(4)"
-                      style="width: 15px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img>
+                      style="width: 20px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img>
                     </el-tooltip>
                     </div>
                   </div>

src/components/scenicSpot/reservation/OrderList.vue

@@ -625,9 +625,14 @@
             <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
+        <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
           <template slot-scope="scope">
-            <commissionDialog :objNew="item"></commissionDialog>
+            <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
+              <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+            </div>
+            <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
+              <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+            </div>
           </template>
         </el-table-column>
       </el-table>