下单，单地接，儿童数量调整

src/components/FinancialModule/TradeCommission/TicketUserDetails.vue

@@ -203,6 +203,7 @@
                 <th>欧洲线奖励</th>
                 <th>其他线人数</th>
                 <th>其他线奖励</th>
+                <th v-if="userInfo.RB_Group_id=2&&userInfo.RB_Branch_id==0">组长奖励</th>
                 <th>总提成</th>
                 <th>出团公司提成</th>
                 <th>期数</th>
@@ -218,6 +219,10 @@
                 <td>{{item.EuropeMoney?item.EuropeMoney:'-'}}</td>
                 <td>{{item.OtherPNum?item.OtherPNum:'-'}}</td>
                 <td>{{item.OtherMoney?item.OtherMoney:'-'}}</td>
+                <td v-if="userInfo.RB_Group_id=2&&userInfo.RB_Branch_id==0"
+                :style="{'color': item.BonusMoney?'#409EFF':''}"
+                :class="[item.BonusMoney?'cursor-p':'']"
+                @click="objNew=item,objNew.PeriodsId=msg.PeriodId,isGroupLeaderReward=true">{{item.BonusMoney?item.BonusMoney:'-'}}</td>
                 <td>{{item.TotalCMoney?item.TotalCMoney:'-'}}
                   <span v-if="item.TotalExtraReward">
                     (额外奖励：{{item.TotalExtraReward}})
@@ -281,17 +286,20 @@
         <button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
       </div>
     </el-dialog>
+    <GroupLeaderReward v-if="isGroupLeaderReward" :obj="objNew" @close="isGroupLeaderReward=false"></GroupLeaderReward>
     </div>
 </template>
 
 <script>
     import moment from "moment"
+    import GroupLeaderReward from "./components/GroupLeaderReward";
     export default {
         components:{
-
+          GroupLeaderReward
         },
         data() {
             return {
+                isGroupLeaderReward: false,
                 objNew:{},
                 outerVisible:false,//提成比例弹窗
                 Month: moment().format("YYYY-MM"),
@@ -333,11 +341,13 @@
                 },
                 disabled:true,
                 rateDataList: [],
-                DigName:''
+                DigName:'',
+                userInfo: {}
             }
         },
         created(){
             let userInfo = this.getLocalStorage();
+            this.userInfo = userInfo
             this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id;    //集团ID
             this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
             this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;

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

+<template>
+  <el-dialog title="组长奖励明细" width="1100px" :visible.sync="isShow" center
+  @close="$emit('close')">
+  <div style="text-align: right;margin-bottom: 10px;">
+    <input type="button" class="hollowFixedBtn" value="查看全部明细"
+    @click="getList(1)">
+  </div>
+    <div v-loading="loading">
+      <div v-for="(item,index) in dataList" :key="index" class="dataList-box">
+        <div class="dataList-heade">
+          <div>姓名：<span>{{item.EmpName}}</span></div>
+          <div>月份：<span>{{item.Month}}</span></div>
+          <div>
+            <span :class="[item.State==1?'groupTourOrder_count_green':
+            'groupTourOrder_count_yellow']">{{item.State==1?'已发放':'未发放'}}</span></div>
+          <div>总奖励金额：<span>{{item.Money}}</span></div>
+          <div>发放日期：<span>{{item.Periods?item.Periods:'-'}}</span></div>
+        </div>
+        <el-table
+        :data="item.DetailList"
+        style="width: 100%">
+          <el-table-column
+          prop="EmpCName"
+          label="组员姓名" width="80"></el-table-column>
+          <el-table-column
+          prop=""
+          label="奖励金额" width="80">
+            <template slot-scope="scope">
+              {{scope.row.Money?scope.row.Money:'-'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+          prop="PeopleNum"
+          label="当月人数" width="80"></el-table-column>
+          <el-table-column label="相关订单">
+            <template slot-scope="scope">
+              <div
+              class="DetailList-form">
+              {{scope.row.OrderIds}}
+              </div>
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="团列表">
+          <template slot-scope="scope">
+            <div v-for="(items,indexs) in scope.row.newTravelList" :key="indexs"
+            class="DetailList-form">
+              <div class="DetailList-right">
+                <div v-if="indexs==0" class="right-title">
+                  <span>团号</span>
+                  <span>团队状态</span>
+                  <span>类型</span>
+                  <span>结团日期</span>
+                </div>
+                <div>
+                  <span @click="goDetails(items)"
+                  style="color: #409EFF;cursor: pointer;">
+                  {{items.TCNUM}} ({{items.TCID}})
+                  </span>
+                  <span>{{items.StatusName}}</span>
+                  <span>{{items.TeamTypeName}}</span>
+                  <span>{{items.OutGroupAuditDate}}</span>
+                </div>
+              </div>
+              <more @change="ViewMore(scope.row,indexs)" :upIcon="scope.row.upIcon"></more>
+            </div>
+          </template>
+          </el-table-column> -->
+          <template slot="append" >
+          </template>
+      </el-table>
+      </div>
+      <div v-if="dataList&&dataList.length==0" style="text-align: center;">{{$t('system.content_noData')}}</div>
+    </div>
+
+
+    <div slot="footer" class="dialog-footer">
+      <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>
+      <button class="hollowFixedBtn" @click="$emit('close')">{{$t('pub.cancelBtn')}}</button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import more from '../../../public/more.vue';
+export default {
+  props: ["obj","type"],
+  components: {more},
+  data() {
+    return {
+      isShow: true,
+      dataList: [],
+      loading: false,
+      total: 0,
+      msg:{
+        pageIndex: 1,
+        pageSize: 3,
+        EmpId: 0,
+        PeriodsId: 0,
+        State: 0,
+      }
+    }
+  },
+  watch: {
+    obj: {
+      handler(newValue,onldValue) {
+        this.msg.EmpId = newValue.EmployeeId?newValue.EmployeeId:0
+        this.msg.PeriodsId = newValue.PeriodsId?newValue.PeriodsId:0
+        this.isShow = true
+        this.getList()
+      },
+      deep:true,
+      immediate: false
+    },
+  },
+  mounted() {
+    if(this.obj){
+      this.msg.EmpId = this.obj.EmployeeId?this.obj.EmployeeId:0
+      this.msg.PeriodsId = this.obj.PeriodsId?this.obj.PeriodsId:0
+      this.isShow = true
+      this.getList()
+    }
+  },
+  methods: {
+    goDetails(row){
+        let name
+        if(row.TeamType==0){
+          name = 'TravelControlList'
+        }else if(row.TeamType==1){
+          name = 'TravelControlListSale'
+        }else if(row.TeamType==2){
+          name = 'oneDayTrip'
+        }
+        this.$emit('close')
+        this.$router.push({
+          path: name,
+          query: {
+            TCID: row.TCID,
+            // id: row.TCID,
+            tcmun: row.TCNUM,
+              blank: 'y',
+              tab: ''
+            }
+          });
+    },
+    ViewMore(x,index){
+        x.upIcon = !x.upIcon
+        if(x.upIcon){
+          x.newTravelList = JSON.parse(JSON.stringify(x.TravelList))
+        }else{
+          x.newTravelList = []
+          x.TravelList.forEach((y,index)=>{
+            if(index<1){
+              x.newTravelList.push(y)
+            }
+          })
+        }
+
+      },
+    handleCurrentChange(val) {
+      this.msg.pageIndex = val;
+      this.getList();
+    },
+    //获取数据
+    getList(type) {
+      if(type){
+        // this.msg.EmpId=0,
+        this.msg.PeriodsId=0
+      }
+      this.loading = true;
+      this.apipost(
+          "sellcommission_GetTYSaleBonusPageList",
+          this.msg,
+          res => {
+              this.loading = false;
+              if (res.data.resultCode == 1) {
+                let data = res.data.data.pageData
+                let arrList = function(arr){
+                  arr.forEach(x=>{
+                    x.upIcon = false
+                    x.newTravelList = []
+                  })
+                }
+                data.forEach(x=>{
+                  arrList(x.DetailList)
+                })
+                this.dataList = data;
+                this.dataList.forEach(x=>{
+                  x.DetailList.forEach((y,index)=>{
+                    y.newTravelList = []
+                    y.TravelList.forEach((z,indexs)=>{
+                      if(indexs<1){
+                        y.newTravelList.push(z)
+                      }
+                    })
+                  })
+                })
+                this.total = res.data.data.count;
+              } else {
+                  this.Error(res.data.message);
+              }
+          },
+          null
+      );
+   },
+  }
+}
+</script>
+
+<style scoped>
+  .dataList-box{
+    background: #F2F2F2;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-radius:5px ;
+  }
+.dataList-heade{
+  display: flex;
+  padding: 10px 0;
+}
+.dataList-heade div{
+  margin-right: 15px;
+  font-size: 14px;
+}
+.dataList-heade div span{
+  font-size: 13px;
+  font-weight: bold;
+}
+.DetailList-form{
+  display: flex;
+  justify-content: space-between;
+}
+.DetailList-right{
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
+}
+.right-title{
+  font-size: 14px;
+  font-weight: bold;
+  color: gray;
+}
+.DetailList-right div{
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.DetailList-right div span{
+  flex: 0 0 25%;
+}
+/deep/.el-table th.el-table__cell{
+  background: #EBEEF5 !important;
+}
+</style>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2854,7 +2854,6 @@
                       </el-button>
                     </el-popover>
                   </div>
-                
                   <div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;">
                     <span>改价申请: 申请金额【<span style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span>
                           <div style="text-align:right;" v-if="childItem.ChangePriceState==1">
@@ -2863,10 +2862,10 @@
                         <div style="text-align:right;" v-if="childItem.ChangePriceState==2">
                           待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核
                         </div>
-                        <div v-if="childItem.ApplyForState==4" style="text-align:right;">
+                        <div v-if="childItem.ChangePriceState==4" style="text-align:right;">
                             已驳回
                           </div>
-                          <div v-if="childItem.ApplyForState==3" style="text-align:right;">
+                          <div v-if="childItem.ChangePriceState==3" style="text-align:right;">
                             已通过
                         </div>
                   </div>

src/components/administrative/SaleGroupManagement.vue

@@ -105,6 +105,7 @@
         <th width="200">组长</th>
         <th>副组长</th>
         <th>员工</th>
+        <th>参与组长奖励</th>
         <th>{{$t('admin.admin_operate')}}</th>
       </tr>
       <tr v-for="(item,index) in DataList">
@@ -112,6 +113,7 @@
         <td> {{item.BigGroupLeadersNameStr}}</td>
         <td> {{item.GroupLeadersNameStr}}</td>
         <td> {{item.EmployeeIdNameStr}}</td>
+        <td> {{item.IsJoinCommission ==1 ?'参与':''}}</td>
         <td>
           <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
             <el-button type="primary" icon="el-icon-edit" circle

src/components/myOrdersAllType/components/allList.vue

@@ -87,7 +87,7 @@
       <div class="HotelWorkList">
           <div class="query-box HotelWorkInput" style="border-bottom: none;">
               <ul>
-                <li v-if="Title=='审核'">
+                <li v-if="Title=='审核'||Title=='查看'">
                   <span>
                     <em>{{$t('fnc.shzhuangtai')}}</em>
                     <el-select v-model='msg2.TicketStatus' class="w200" @change="msg2.papageIndex==1,GetList()">

src/plug/index.js

@@ -121,8 +121,10 @@ export default {
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
-        domainUrl = "http://192.168.5.46"; 
-        //domainUrl = "http://192.168.5.46"; 
+        domainUrl = "http://192.168.5.214";
+        // domainUrl = "http://192.168.5.46";
+        domainUrl = "http://192.168.5.25:8083";
+        // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";