1

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -161,6 +161,7 @@
           <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 width='200'>{{$t('pub.pubRemark')}}</th>
@@ -183,6 +184,7 @@
           <td><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.UserId,item.UserName)">{{item.Rate?item.Rate+'%':'-'}}</span></td>
           <td>{{item.OrderProfit}}</td>
           <td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
+          <td>{{item.WaitCommissionMoney?item.WaitCommissionMoney:'-'}}</td>
           <td><span v-if="item.IssueNum<3" style="padding-left:5px;color:blue;cursor: pointer;text-decoration: underline;" @click="goUrlUser('TradeTicketDetails',item)">第{{item.IssueNum}}次提成</span>
             <span v-else-if="item.IssueNum>=3" style="padding-left:5px;color:red;cursor: pointer;text-decoration: underline;" @click="goUrlUser('TradeTicketDetails',item)">第{{item.IssueNum}}次提成</span></td>
 

src/components/FinancialModule/TradeCommission/TicketUserDetails.vue

@@ -207,6 +207,7 @@
                 <th>总提成</th>
                 <th>公司提成</th>
                 <th>期数</th>
+                <th style="width:230px">备注</th>
                 <th>{{$t('system.table_operation')}}</th>
             </tr>
             <tr v-for="item in dataList">
@@ -214,11 +215,11 @@
                 <td>{{item.DeptName}}</td>
                 <td>{{item.UserName}}</td>
                 <td>{{item.PeopleNum?item.PeopleNum:'-'}}</td>
-                <td>{{item.PeopleMoney?item.PeopleMoney:'-'}}</td>
+                <td>{{item.PeopleMoney?item.PeopleMoney:'-'}}<span v-if="item.WaitPeopleMoney">(待发 {{item.WaitPeopleMoney}})</span></td>
                 <td>{{item.EuropePNum?item.EuropePNum:'-'}}</td>
-                <td>{{item.EuropeMoney?item.EuropeMoney:'-'}}</td>
+                <td>{{item.EuropeMoney?item.EuropeMoney:'-'}}<span v-if="item.WaitEuropeMoney">(待发 {{item.WaitEuropeMoney}})</span></td>
                 <td>{{item.OtherPNum?item.OtherPNum:'-'}}</td>
-                <td>{{item.OtherMoney?item.OtherMoney:'-'}}</td>
+                <td>{{item.OtherMoney?item.OtherMoney:'-'}}<span v-if="item.WaitOtherMoney">(待发 {{item.WaitOtherMoney}})</span></td>
                 <td v-if="userInfo.RB_Group_id=2&&userInfo.RB_Branch_id==0"
                 :style="{'color': item.BonusMoney?'#409EFF':''}"
                 :class="[item.BonusMoney?'cursor-p':'']"
@@ -230,6 +231,7 @@
                 </td>
                 <td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
                 <td><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.UserId,item.UserName)">{{item.Periods}}</span></td>
+                <td>{{item.Description}}</td>
                 <td>
                     <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
                         <el-button type="primary" class="CM_look" @click="goUrl('TradeTicketDetails',item)"

src/components/FinancialModule/TradeCommission/components/GroupLeaderReward.vue

@@ -106,7 +106,7 @@ export default {
   watch: {
     obj: {
       handler(newValue,onldValue) {
-        this.msg.EmpId = newValue.EmployeeId?newValue.EmployeeId:0
+        this.msg.EmpId = newValue.UserId?newValue.UserId:0
         this.msg.PeriodsId = newValue.PeriodsId?newValue.PeriodsId:0
         this.isShow = true
         this.getList()
@@ -117,7 +117,7 @@ export default {
   },
   mounted() {
     if(this.obj){
-      this.msg.EmpId = this.obj.EmployeeId?this.obj.EmployeeId:0
+      this.msg.EmpId = this.obj.UserId?this.obj.UserId:0
       this.msg.PeriodsId = this.obj.PeriodsId?this.obj.PeriodsId:0
       this.isShow = true
       this.getList()