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

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -645,6 +645,9 @@
                     <el-dropdown-item @click.native="gotoOrder(item)">
                       报名清单
                     </el-dropdown-item>
+                    <el-dropdown-item @click.native="gotoPay(item)">
+                      包机结算
+                    </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -663,7 +666,8 @@
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
     <div class="buy-box" v-show="isShowTeamOrder">
-      <orderForm @success="reSearchPage" @close="closeForm" :priceObj="teamInfo"></orderForm>
+      <orderForm @success="reSearchPage" @close="closeForm" :PTCID="teamInfo.TCID" :POrderId="0" :PBranchId="0" :PProductType="2">
+      </orderForm>
     </div>
   </div>
 </template>
@@ -699,25 +703,23 @@
         },
         dataList: [],
         isShowTeamOrder: false, //是否显示订单弹窗
-        teamInfo: {},//团队信息
+        teamInfo: {}, //团队信息
       };
     },
     components: {
       orderForm: orderForm
     },
- 
     methods: {
       //刷新页面
       reSearchPage() {
         this.isShowTeamOrder = false;
-        this.teamInfo={};
+        this.teamInfo = {};
         this.getList();
       },
       //关闭窗口
-      closeForm()
-      {
-        this.isShowTeamOrder=false;
-        this.teamInfo={};
+      closeForm() {
+        this.isShowTeamOrder = false;
+        this.teamInfo = {};
       },
       //跳转到报名清单
       gotoOrder(item) {
@@ -726,6 +728,13 @@
           tcmun: item.TCNUM
         });
       },
+      //跳转到报名清单
+      gotoPay(item) {
+        this.OpenNewPage('/TravelPay', {
+          id: item.TCID,
+          tcmun: item.TCNUM
+        });
+      },
       // 结束日期不能大于开始日期
       dataDui() {
         if (this.msg.StartTime > this.msg.EndTime && this.msg.EndTime !== "") {
@@ -734,8 +743,8 @@
         }
       },
       goBuy(obj) {
-        this.isShowTeamOrder = true;
         this.teamInfo = obj;
+        this.isShowTeamOrder = true;
       },
       getList() {
         this.loading = true;

src/components/TravelManager/TravelTeam/travelPayList.vue

+<style scoped>
+  @import "../../../assets/css/newTravelManager.css";
+
+  .w_20 {
+    width: 20%;
+  }
+
+  .w_10 {
+    width: 10%;
+  }
+
+  .mb {
+    margin-bottom: 10px;
+  }
+
+  .title {
+    font-weight: 600;
+  }
+
+  .p20 {
+    padding: 20px;
+  }
+
+</style>
+<template>
+  <div class="TC_Content">
+    <div class="TC-MyList">
+      <div class="TravelTclList" v-loading="queryMsg.loading">
+        <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
+          layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
+        </el-pagination>
+        <ul>
+          <li v-for="(item,index) in queryDataObj.dataList" :key="item.GTeamId"
+            :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
+            <div class="TC_remarkContent">
+              <div class="el-col w_20">
+                <div class="p20">
+                  <div class="mb title"><i class="iconfont icon-biaoti1"></i><span>包机信息</span></div>
+                  <div>合作伙伴:<span>{{item.ContactName}}</span></div>
+                  <div>已入名单人数：<span>{{item.EntGuestNum}}</span></div>
+                  <div>已入名单人数：<span>{{item.IsHaveFinance}}</span></div>
+                  <div>报名总人数:<span>{{item.GuestNum}}</span></div>
+                  <div>应收总金额：<span>{{item.PreferPrice}}</span></div>
+                  <div>退款金额：<span>{{item.Refund}}</span></div>
+                  <div>平台税金:<span>{{item.PlatformTax}}</span></div>
+                  <div>实收：<span>{{item.Income}}</span></div>
+                  <div>在途金额：<span>{{item.ZaiTuMoney}}</span></div>
+                  <div>折扣金额:<span>{{item.DiscountMoney}}</span></div>
+                  <div>大红包抵扣金额：<span>{{item.RedEnvelopeMoney}}</span></div>
+                  <div>代收总金额：<span>{{item.DueInMoney}}</span></div>
+                  <div>利润（先给这个字段，规则还没有）：<span>{{item.CommissionRate}}</span></div>
+                  
+                </div>
+              </div>
+              <div class="el-col w_20">
+                <div class="p20">
+                  <div class="mb title"><i class="iconfont icon-hangban1"></i><span>航班信息</span></div>
+                </div>
+              </div>
+              <div class="el-col w_10">
+                <div class="p20">
+                  <div class="mb title"><i class="iconfont icon-jiage"></i><span>机位信息</span></div>
+                </div>
+              </div>
+              <div class="el-col w_10">
+                <div class="p20">
+                  <div class="mb title"><i class="iconfont icon-jiage"></i><span>价格信息</span></div>
+                </div>
+              </div>
+              <div class="el-col w_20">
+                <div class="p20">
+                  <div class="mb title"><i class="iconfont icon-tuandui"></i><span>合作伙伴</span></div>
+                </div>
+              </div>
+              <div class="el-col w_10">
+                <div class="p20">
+                  <div class="mb title"><i class="iconfont icon-yuangong"></i><span>发起信息</span></div>
+                </div>
+              </div>
+              <div class="el-col w_10">
+                <div class="p20">
+                </div>
+              </div>
+            </div>
+          </li>
+        </ul>
+        <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
+        <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
+          layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
+        </el-pagination>
+      </div>
+    </div>
+    <el-dialog class="app-attachment-dialog" width="900" :title="dialogTitle" :visible.sync="isShowEditTeamDialog"
+      :close-on-click-modal="false">
+      <editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import editTeamInfo from "../TravelTeam/editTeamInfo"; //新增修改包机团
+
+  export default {
+    provide() {
+      return {
+        reload: this.reload
+      }
+    },
+    components: {
+      editTeamInfo
+    },
+    data() {
+      return {
+        isShowEditTeamDialog: false, //是否显示新增修改包机团弹窗
+        dialogTitle: "添加包机信息", //弹窗名称
+        GTeamId: 0, //包机团队Id
+        //查询参数
+        queryMsg: {
+          pageIndex: 1,
+          pageSize: 10,
+          total: 0,
+          TCID: '',
+          //是否有数据
+          noData: false,
+          currentPage: 1,
+          loading: false, //加载层
+        },
+        queryDataObj: {
+          dataList: [], //数据列表
+        },
+      };
+    },
+    //监听器
+    watch: {
+      // 方法1
+      '$route'(to, from) { //监听路由是否变化
+        location.reload()
+      },
+    },
+    methods: {
+      //刷新页面
+      refreshPage() {
+        this.isShowEditTeamDialog = false;
+        this.getTravelTeamList();
+      },
+      //翻页
+      handleCurrentChange(val) {
+        this.queryMsg.pageIndex = val;
+        this.getTravelTeamList();
+      },
+      //重新查询
+      resetQuery() {
+        this.queryMsg.pageIndex = 1;
+        this.getTravelTeamList();
+      },
+      //获取包机列表
+      getTravelTeamList() {
+        this.queryMsg.loading = true;
+        this.apipost(
+          "sellorder_post_GetTravelTeamOrderList",
+          this.queryMsg,
+          res => {
+            this.queryMsg.loading = false;
+            if (res.data.resultCode == 1) {
+              this.queryDataObj.dataList = res.data.data;
+              this.queryMsg.total = res.data.data.count;
+            }
+          }
+        );
+      },
+    },
+    mounted() {
+      console.log('mounted', this.$route)
+      this.queryMsg.TCID = this.$route.query.id
+      this.getTravelTeamList();
+    },
+    created() {
+    }
+  };
+
+</script>

src/components/commonPage/commonTeamInfo.vue

@@ -2,7 +2,6 @@
   @import "../../assets/css/trip/index.css";
 
 </style>
-
 <template>
   <div class="trip-box-commonTeam" v-loading="loading">
     <div class="item-title">
@@ -15,7 +14,8 @@
     <div class="trip-block-commonTeam" v-for="(item,i) in tripList" :key="i">
       <div class="trip-title">
         <div>
-          <p class="day">{{$t('tips.di')}}<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}{{$t('hotel.hotel_day')}}</p>
+          <p class="day">{{$t('tips.di')}}<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}{{$t('hotel.hotel_day')}}
+          </p>
           <template v-if="startDate&&startDate!=''">
             <p>{{GetDayStr(startDate,item.dayNum-1)}}</p>
           </template>
@@ -68,7 +68,7 @@
         var msg = {
           configId: id,
           tcid: nTCID,
-          isClick:1//不算统计
+          isClick: 1 //不算统计
         };
         if (id !== undefined) {
           //根据ID 获取行程内容
@@ -222,12 +222,12 @@
             dayItem.dayArray = dayArray;
             dayList.push(dayItem);
           });
-          
+
           this.tripList = dayList;
           this.init();
         }
       },
-     setDate: function (j) {
+      setDate: function (j) {
         let stDate = "";
         if (this.priceList && this.priceList.length > 0) {
           stDate = this.priceList[0].startDate;
@@ -250,7 +250,7 @@
         }
       },
       init() {
-         this.tripList.forEach((x, j) => {
+        this.tripList.forEach((x, j) => {
           let useDinnerTypeBy = ''
           let jin = [],
             jiu = [],
@@ -392,11 +392,7 @@
           x.jiu2 = jiu2
           if (jin.length > 0) {
             details = jin
-          }
-          // else if (jiu.length > 0) {
-          //  // details = jiu
-          // } 
-          else if (dadian.length > 0) {
+          } else if (dadian.length > 0) {
             details = dadian
           } else if (jiao.length > 0) {
             if (j == this.tripList.length - 1) {

src/router/config.js

@@ -2317,7 +2317,7 @@ export default {
               name: 'priceGroup',
               component: resolve => require(['@/components/TravelManager/TravelTeam/priceGroup'], resolve),
               meta: {
-                title: '包机列表'
+                title: '包机产品'
               },
             }, {
               path: '/TravelTeam', //包机列表
@@ -2326,6 +2326,13 @@ export default {
               meta: {
                 title: '包机列表'
               },
+            }, {
+              path: '/TravelPay', // 包机结算
+              name: 'TravelPay',
+              component: resolve => require(['@/components/TravelManager/TravelTeam/travelPayList'], resolve),
+              meta: {
+                title: '包机结算'
+              },
             }, {
               path: '/TravelSupplier', //供应商列表
               name: 'TravelSupplier',