1

src/components/FinancialModule/OpCommission/OPCommissionDetail.vue

@@ -218,7 +218,7 @@
               </td>
               <td>{{item.TotalCMoney?item.TotalCMoney:'-'}}</td>
               <td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
-              <td>{{item.Periods}}</td>
+              <td><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.EmployeeId,item.UserName)">{{item.Periods}}</span></td>
               <td>{{item.Description}}</td>
               <td>
                   <el-tooltip class="item" effect="dark" content="查看" placement="top">
@@ -238,6 +238,42 @@
           layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
       </el-pagination>
       <RewardDetail v-if="isRewardDetail" :obj="objNew" @close="isRewardDetail=false"></RewardDetail>
+
+      <el-dialog width="1000px" :title="DigName+'-提成比例'" :visible.sync="outerVisible" center>
+        <div>注意：OP提成以出团日期定档，需当月所负责的所有团完结后方可发放提成，以下只统计小包团/当地游/单项产品</div>
+            <div
+                class="cm_content"
+                style="width: 100%;margin-bottom: 5px; "
+            >
+                <table
+                class="po_content singeRowTable"
+                style="border:1px solid #E6E6E6;"
+                cellspacing="0"
+                cellpadding="0"
+                v-loading="loading2">
+                <tr>
+                    <th>月份</th>
+                    <th>线路</th>
+                    <th>未完结团</th>
+                </tr>
+                <tr v-for="item in rateDataList">
+                    <td>{{item.Month}}</td>
+                    <td>
+                        <span v-for="qitem in item.List">
+                            {{qitem.LineName}} &nbsp;&nbsp; 团数：{{qitem.TravelNum}} &nbsp;&nbsp; <span v-if="qitem.SinleNum>0">单项产品：{{qitem.SinleNum}} &nbsp;&nbsp;</span> 累计利润：{{qitem.MonthProfit}} &nbsp;&nbsp; 定档比例：{{qitem.Rate}}% </br>
+                        </span>
+                    </td>                    
+                    <td>{{item.NoCommissionTCID}}</td>
+                </tr>
+                <tr v-if="rateDataList.length==0">
+                    <td style="text-align:center" colspan="3">暂无数据</td>
+                </tr>
+                </table>
+            </div>
+    <div slot="footer" class="dialog-footer">
+        <button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -265,6 +301,7 @@
               },
 
               loading: false,
+              loading2: false,
               //数据源
               dataList: [],
               total: 0,
@@ -290,7 +327,9 @@
         ParentId:'-1',
         Tier:'0',
               },
-              disabled:true
+              disabled:true,
+              rateDataList: [],
+                DigName:''
           }
       },
       created(){
@@ -419,8 +458,28 @@
               msg.EmployeeIdUser = userInfo.EmployeeId
               var fileName = "OP提成分组表.xls";
               this.GetLocalFile("opcommission_GetNewOPCommissionEmpListToExcel", msg, fileName);
-          }
-
+          },
+          openCommissionRate(userId,name){
+                this.DigName = name;
+                this.outerVisible = true;
+                this.getCommissionRateData(userId);
+            },
+            getCommissionRateData(userId){
+                this.loading2 = true;
+                this.apipost(
+                    "opcommission_GetOPCommissionGrade",
+                    {UserId : userId},
+                    res => {
+                        this.loading2 = false;
+                        if (res.data.resultCode == 1) {
+                            this.rateDataList = res.data.data;
+                        } else {
+                            this.Error(res.data.message);
+                        }
+                    },
+                    null
+                );
+            }
       }
   }
 </script>

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -183,7 +183,8 @@
            <p v-if="item.DeductProfit&&item.DeductProfit>0">抵扣利润：-{{item.DeductProfit}}</p>
           </td>
           <td>{{item.Way==1?'人头奖励':'利润比例'}}</td>
-          <td>{{item.Rate&&item.Way==2?item.Rate+'%':item.Rate&&item.Way==1?item.Rate+'/人':'-'}}</td>
+          <td v-if="item.Way==1">{{item.Rate+'/人'}}</td>
+          <td v-if="item.Way==2"><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.EmployeeId,item.UserName)">{{item.Rate+'%'}}</span></td>
           <td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
           <td>{{item.PeriodsReissue}}</td>
           <td>{{item.Description?item.Description:'-'}}</td>
@@ -196,6 +197,43 @@
       <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
         layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
       </el-pagination>
+
+      <el-dialog width="1000px" :title="DigName+'-提成比例'" :visible.sync="outerVisible" center>
+        <div>注意：OP提成以出团日期定档，需当月所负责的所有团完结后方可发放提成，以下只统计小包团/当地游/单项产品</div>
+            <div
+                class="cm_content"
+                style="width: 100%;margin-bottom: 5px; "
+            >
+                <table
+                class="po_content singeRowTable"
+                style="border:1px solid #E6E6E6;"
+                cellspacing="0"
+                cellpadding="0"
+                v-loading="loading2">
+                <tr>
+                    <th>月份</th>
+                    <th>线路</th>
+                    <th>未完结团</th>
+                </tr>
+                <tr v-for="item in rateDataList">
+                    <td>{{item.Month}}</td>
+                    <td>
+                        <span v-for="qitem in item.List">
+                            {{qitem.LineName}} &nbsp;&nbsp; 团数：{{qitem.TravelNum}} &nbsp;&nbsp; <span v-if="qitem.SinleNum>0">单项产品：{{qitem.SinleNum}} &nbsp;&nbsp;</span> 累计利润：{{qitem.MonthProfit}} &nbsp;&nbsp; 定档比例：{{qitem.Rate}}% </br>
+                        </span>
+                    </td>                    
+                    <td>{{item.NoCommissionTCID}}</td>
+                </tr>
+                <tr v-if="rateDataList.length==0">
+                    <td style="text-align:center" colspan="3">暂无数据</td>
+                </tr>
+                </table>
+            </div>
+    <div slot="footer" class="dialog-footer">
+        <button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
+      </div>
+    </el-dialog>
+
     </div>
   </template>
 
@@ -223,6 +261,7 @@
             RB_Branch_Id: -1,//出团公司ID
           },
           loading: false,
+          loading2: false,
           //数据源
           dataList: [],
           total: 0,
@@ -258,7 +297,10 @@
           },
           S_CheckBranchOrder:false,
           S_CheckAllOrder:false,
-          disabled:true
+          disabled:true,
+          rateDataList: [],
+                DigName:'',
+                outerVisible:false,//提成比例弹窗
         }
       },
       created(){
@@ -557,8 +599,28 @@
           msg.EmployeeIdUser = userInfo.EmployeeId
           var fileName = "OP提成明细表.xls";
           this.GetLocalFile("opcommission_GetNewOPCommissionDetailsListToExcel", msg, fileName);
-        }
-
+        },
+        openCommissionRate(userId,name){
+                this.DigName = name;
+                this.outerVisible = true;
+                this.getCommissionRateData(userId);
+            },
+            getCommissionRateData(userId){
+                this.loading2 = true;
+                this.apipost(
+                    "opcommission_GetOPCommissionGrade",
+                    {UserId : userId},
+                    res => {
+                        this.loading2 = false;
+                        if (res.data.resultCode == 1) {
+                            this.rateDataList = res.data.data;
+                        } else {
+                            this.Error(res.data.message);
+                        }
+                    },
+                    null
+                );
+            }
       }
     }
 

src/components/FinancialModule/TradeCommission/TicketUserDetails.vue

@@ -224,7 +224,7 @@
                   </span>
                 </td>
                 <td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
-                <td><span class="cursor-p" @click="openCommissionRate(item.UserId,item.UserName)">{{item.Periods}}</span></td>
+                <td><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.UserId,item.UserName)">{{item.Periods}}</span></td>
                 <td>
                     <el-tooltip class="item" effect="dark" content="查看" placement="top">
                         <el-button type="primary" class="CM_look" @click="goUrl('TradeTicketDetails',item)"

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1773,13 +1773,13 @@
           var month = today.getMonth();
           var date = today.getDate();
           var weeks = ["日", "一", "二", "三", "四", "五", "六"]
-          var temp = new Date(year, month, date + 7)
+          var temp = new Date(year, month, date + 30)
           var today = Date.parse(new Date())
           var PayDate = this.msg.PayDate
           var startTime = Date.parse(temp);
           var endTime = Date.parse(PayDate);
           if (endTime > startTime) {
-            this.$message.error('房费、差旅费、签证费、机票相关费用类型单据的预付款日期最多推后7天！');
+            this.$message.error('房费、差旅费、签证费、机票相关费用类型单据的预付款日期最多推后30天！');
             return
           }
           //  else if (endTime < today) {