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

src/components/FinancialModule/OPcommissionPeriods.vue

+<style>
+  .CM_look{
+      padding:4px!important;
+      position: relative;
+      top:1px;
+  }
+</style>
+<template>
+  <div class="flexOne">
+    <!-- <div class="query-box">
+      <ul>
+        <li>
+            <input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
+        </li>
+      </ul>
+    </div> -->
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <th>期数</th>
+        <th>提成总金额</th>
+        <th>{{$t('admin.admin_czPerson')}}</th>
+        <th>日期</th>
+        <th>{{$t('system.table_operation')}}</th>
+      </tr>
+      <tr v-for="item in dataList">
+        <td>{{item.Periods}}</td>
+        <td>{{item.SumPrice}}</td>
+        <td>{{item.CreateByStr}}</td>
+        <td>{{item.CreateStr}}</td>
+        <td>
+          
+          <el-tooltip class="item" effect="dark" content="查看" placement="top">
+            <el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.ID)" icon="iconfont icon-chakan" circle></el-button>
+          </el-tooltip>
+        </td>
+      </tr>
+    </table>
+    <!-- 分页 -->
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+          layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        msg: {
+          PageIndex: 1,
+          PageSize: 20
+        },
+        loading:false,
+        //数据源
+        dataList:[],
+        total:0,
+        currentPage: 1,
+      }
+    },
+    mounted() {
+      this.getList();
+    },
+    methods: {
+      handleCurrentChange(val) {
+        this.msg.PageIndex = val;
+        this.getList();
+      },
+      goUrl(path,id) {
+        this.$router.push({
+          path: path,
+          query: {
+            ParentId:id,
+            blank: 'y',
+            tab: '期数详情'
+          }
+        });
+      },
+      //获取数据
+      getList() {
+        this.loading = true;
+        this.apipost(
+          "sellcommission_GetOPCommissionPageList",
+          this.msg,
+          res => {
+            this.loading = false;
+            if(res.data.resultCode==1){
+              this.dataList = res.data.data.pageData;
+              console.log(res);
+              this.total = res.data.data.count;
+            }else{
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      //生成提成报表
+      generateTable(){
+       let msg = {
+          UserId: 0
+        }
+        this.apipost(
+            "sellcommission_SetGenerateCommission",msg,
+            res => {
+              if(res.data.resultCode==1){
+                this.getList();
+                this.Success('报表生成成功')
+              }else{
+                this.Error(res.data.message);
+              }
+            },
+            null
+          );
+        }
+    }
+  }
+</script>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -796,6 +796,7 @@
   }
    .KT_Scenic table th{
       height:30px;
+      border:1px solid #d1d1d1;
   }
   .KT_Scenic table td{
       padding:9px 5px!important;
@@ -3639,8 +3640,8 @@
           res => {
             if (res.data.resultCode == 1) {
               this.isAllowUpdate = res.data.data.IsUpdatePlatOrder;
-
               let x = res.data.data.model;
+       
               let modelPrice = res.data.data.modelPrice;
               this.addMsg = x;
               this.addObj = res.data.data.modelPrice;
@@ -3648,7 +3649,7 @@
               this.addObj.OpSetLossMoney = x.OpSetLossMoney;
               this.addMsg.OneSex = x.OneSex;
               this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
-              this.addMsg.OrderBackScenicList=[];
+           
               this.getScenicRefund(obj.tcid,obj.orderId);
               this.getPlatformAccount(obj.platformAccountTypeId, obj.platformAccount);
               this.SetOutCityId = res.data.data.SetOutCityId;
@@ -3665,9 +3666,10 @@
               this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
-              this.addMsg.OrderForm = x.OrderForm
-              this.addMsg.allName = x.ContactName
-
+              this.addMsg.OrderForm = x.OrderForm;
+              this.addMsg.allName = x.ContactName;
+              this.addMsg.OrderBackScenicList=x.OrderBackScenicList;
+              
               this.IsChildrenTour = x.IsChildrenTour;
               this.IsBirdDiscount = x.IsBirdDiscount;
               this.OpSetLossPeople = x.OpSetLossPeople;

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -903,6 +903,32 @@
     font-size: 12px;
     margin-left: 10px;
   }
+   .RL_Scenic{
+    width:400px;
+    max-height: 400px;
+    overflow: auto;
+  }
+   .RL_Scenic table th{
+      height:30px;
+      border: 1px solid #d2d2d2;
+  }
+  .RL_Scenic table td{
+      padding:9px 5px!important;
+      border: 1px solid #d2d2d2;
+  }
+  .RL_Scenic table ._color_666 {
+    background-color: #ededed;
+    color:#666666;
+  }
+
+  .RL_Scenic table{
+    padding: 10px 0 0 20px;
+    border-collapse: collapse;
+    border: 1px solid #d2d2d2;
+    font-size: 12px;
+    margin: 0 20px 5px 0;
+    width: 100%;
+  }
 
 </style>
 
@@ -1533,7 +1559,7 @@
           <th width="150" class="nowrap">操作</th>
         </tr>
         <tr>
-          <td v-show="OrderDataList.length==0" colspan="14" align="center">暂无数据</td>
+          <td v-show="OrderDataList.length==0" colspan="16" align="center">暂无数据</td>
         </tr>
 
         <tr v-if="OrderDataList.leadetList!=null && OrderDataList.leadetList.length>0">
@@ -2032,7 +2058,24 @@
                 <!--                <span class="RL-redType RL-remarkCon" v-else>-->
                 <!--                  <span>暂无名单</span>-->
                 <!--                </span>-->
-                <span style="display: block">房间信息：{{childItem.OrderGuestHouseStr}}</span>
+                <span style="display: block">
+                  房间信息：{{childItem.OrderGuestHouseStr}}
+                    <el-popover trigger="click" popper-class="RL_Scenic">
+                      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                        <tr class="_color_666" style="text-align:center;">
+                          <th width="150">景点名称</th>
+                          <th width="60">人数</th>
+                          <th width="60">退款金额</th>
+                        </tr>
+                        <tr v-for="fItem in childItem.OrderBackScenicList" style="text-align:center;">
+                          <td style="text-align:left;">{{fItem.CouponsName}}</td>
+                          <td>{{fItem.Number}}</td>
+                          <td>{{fItem.BackMoney}}</td>
+                        </tr>
+                      </table>
+                      <span slot="reference" v-if="childItem.OrderBackScenicList&&childItem.OrderBackScenicList.length>0" style="color:#f56c6c;margin-left:20px;cursor:pointer;">退景点</span>
+                    </el-popover>
+                </span>
                 <div>
                   <span v-if="childItem.OPTipMoney==''&&childItem.TipMoney!=''" style="color:red">（小费：{{childItem.TipMoney}}）</span>
                   <span v-if="childItem.OPTipMoney!=''" style="color:red">
@@ -3325,6 +3368,7 @@
               this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
+              this.addMsg.OrderBackScenicList=x.OrderBackScenicList;
 
               this.IsChildrenTour = x.IsChildrenTour;
               this.IsBirdDiscount = x.IsBirdDiscount;

src/router/config.js

@@ -3438,6 +3438,30 @@ export default {
                                 title: '销售提成规则'
                             }
                         },
+                        {
+                            path: '/OPRules',
+                            name: 'OPRules',
+                            component: resolve => require(['@/components/FinancialModule/OPRules'], resolve),
+                            meta: {
+                                title: 'op提成规则'
+                            }
+                        },
+                        {
+                            path: '/OPcommissionPeriods',
+                            name: 'OPcommissionPeriods',
+                            component: resolve => require(['@/components/FinancialModule/OPcommissionPeriods'], resolve),
+                            meta: {
+                                title: 'op提成期数'
+                            }
+                        },
+                        {
+                            path: '/OPCommissionDetail',
+                            name: 'OPCommissionDetail',
+                            component: resolve => require(['@/components/FinancialModule/OPCommissionDetail'], resolve),
+                            meta: {
+                                title: 'op提成期数详情'
+                            }
+                        },
                         {
                             path: '/CouponList',
                             name: 'CouponList',