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

src/components/FinancialModule/DataAnalysis/components/waitpay.vue

+<template>
+  <div style="margin-bottom: 20px; ">
+    
+    <el-table
+    :data="BranchAnalysisData"
+    style="width: 100%;"
+    class="LineAnalysisDataBJ">
+        <el-table-column
+          prop="Name"
+          label="类目"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+              {{scope.row.Name}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="CurrencyName"
+          label="币种"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+              {{scope.row.CurrencyName}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="TotalMoney"
+          label="金额"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.TotalMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="团队">
+        <el-table-column
+          prop="CurrentMoney"
+          label="账期(月内)"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.CurrentMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="AgoOneMoney"
+          label="账期(一个月)"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.AgoOneMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="AgoTwoMoney"
+          label="账期(两个月)"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.AgoTwoMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="AgoThreeMoney"
+          label="账期(两个月以上)"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.AgoThreeMoney}}
+          </template>
+        </el-table-column>
+      </el-table-column>
+
+      <el-table-column align="center" label="非团队">
+        <el-table-column
+          prop="NCurrentMoney"
+          label="账期(月内)"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.NCurrentMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="NAgoOneMoney"
+          label="账期(一个月)"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.NAgoOneMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="NAgoTwoMoney"
+          label="账期(两个月)"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.NAgoTwoMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="NAgoThreeMoney"
+          label="账期(两个月以上)"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.NAgoThreeMoney}}
+          </template>
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['StatisticalData'],
+  data() {
+    return {
+      MonthList: [],//月份列表
+      BranchAnalysisData: [],
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+
+  },
+  watch: {
+    StatisticalData:{
+      handler(n,o){
+        this.MonthList = n.MonthList//月份列表
+        this.BranchAnalysisData = n.BranchAnalysisData
+      },
+      deep: true,
+      immediate: false,
+    }
+  },
+}
+</script>
+
+<style scoped>
+/deep/.LineAnalysisDataBJ tr td:nth-child(1n){
+  background: #F5F7FA;
+}
+/deep/.LineAnalysisDataBJ tr td:nth-child(2n){
+  background: #fff;
+}
+/deep/.LineAnalysisDataBJ tr th{
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ tr:first-child th:first-child{
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ tr:nth-child(2) th:nth-child(1n){
+  /* background: #fff; */
+}
+/deep/.el-table.LineAnalysisDataBJ tr:nth-child(2) th:nth-child(2n){
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ tr:first-child th{
+  background: #fff;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr:first-child th:nth-child(1n){
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr:first-child th:nth-child(2n){
+  background: #fff;
+}
+/deep/.el-table.LineAnalysisDataBJ tr th{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr th{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+/deep/.el-table.LineAnalysisDataBJ tr td{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr td{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+.corporatioBox{
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  margin-left: 15px;
+}
+.corporatioBox div{
+  /* display: flex;
+  flex-direction: column; */
+  background: #fff;
+  padding: 5px 10px;
+  margin-right: 10px;
+}
+.corporatioBox div span:first-child{
+  text-align: left;
+  font-size: 14px;
+}
+.corporatioBox div span:last-child{
+  color: red;
+  margin-left: 10px;
+}
+</style>

src/components/FinancialModule/DataAnalysis/index.vue

@@ -8,6 +8,7 @@
       <el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.yushiduibiqk')" name="5"></el-tab-pane>
       <!-- <el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.cashqk')" name="6"></el-tab-pane> -->
       <el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" label="平台收款占比" name="7"></el-tab-pane>
+      <el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" label="待付款情况" name="8"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="90px">
@@ -94,7 +95,7 @@
               <el-input v-model="shopMsg.MaoLiRate" type="number"  @change="getMaoLiRate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" v-if="activeName!=4 && activeName!=3 && activeName!=7">
+          <el-col :span="4" v-if="activeName!=4 && activeName!=3 && activeName!=7&& activeName!=8">
             <el-form-item :label="$t('advmanager.v_line')">
               <el-select filterable v-model="msg.LineId" @change="getStatement"
               clearable>
@@ -111,7 +112,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="6" v-if="activeName!=8">
             <el-form-item :label="$t('pub.date')">
               <!-- <el-date-picker
                   size="small"
@@ -149,7 +150,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="2" v-if="activeName!=3 && activeName!=5 && activeName!=7">
+          <el-col :span="2" v-if="activeName!=3 && activeName!=5 && activeName!=7&& activeName!=8">
             <el-form-item :label="$t('objFill.v101.FinancialModule.jiduhuiz')">
               <el-checkbox v-model="msg.LossType" true-label="1" false-label="0" @change="getStatement"></el-checkbox>
             </el-form-item>
@@ -161,7 +162,7 @@
           <button class="hollowFixedBtn" @click="getStatement">
             {{ $t("pub.searchBtn") }}
           </button>
-          <button v-if="activeName!=4 && activeName!=5 && activeName!=7" class="normalBtn" @click="exportExcel">
+          <button v-if="activeName!=4 && activeName!=5 && activeName!=7&& activeName!=8" class="normalBtn" @click="exportExcel">
             {{$t('visa.v_daochu')}}
           </button>
           <button v-if="activeName==4" class="normalBtn" @click="exportExcel2">
@@ -173,6 +174,9 @@
           <button v-if="activeName==7" class="normalBtn" @click="exportExcel4">
             {{$t('visa.v_daochu')}}
           </button>
+          <button v-if="activeName==8" class="normalBtn" @click="exportExcel4">
+            {{$t('visa.v_daochu')}}
+          </button>
         </li>
       </ul>
     </div>
@@ -184,6 +188,7 @@
       <PrerealContrast v-if="activeName=='5'" :StatisticalData="StatisticalData"></PrerealContrast>
       <Cashflows v-if="activeName=='6'" :StatisticalData="StatisticalData"></Cashflows>
       <PlatfromIncomes v-if="activeName=='7'" :StatisticalData="StatisticalData"></PlatfromIncomes>
+      <WaitPays v-if="activeName=='8'" :StatisticalData="StatisticalData"></WaitPays>
     </div>
   </div>
 </template>
@@ -194,12 +199,13 @@ import Lines from "./components/line.vue";
 import Corporations from "./components/corporation.vue";
 import Cashflows from "./components/cashflow.vue";
 import PlatfromIncomes from "./components/platfromIncome.vue";
+import WaitPays from "./components/waitpay.vue";
 import Packets from "./components/packet.vue";
 import ShoppingCommission from "./components/ShoppingCommission.vue";
 import PrerealContrast from "./components/PrerealContrast.vue";
 import StartYMDateLimit from '../../public/StartYMDateLimit.vue';
 export default {
-  components: {Lines,Corporations,Cashflows,PlatfromIncomes,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
+  components: {Lines,Corporations,Cashflows,PlatfromIncomes,WaitPays,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
   data() {
     return {
       coinGetShow: false,
@@ -364,6 +370,9 @@ export default {
       if(this.activeName=='7'){
         url = 'financestatistics_post_GetPlatformIncomeAnalysisStat'
       }
+      if(this.activeName=='8'){
+        url = 'financestatistics_post_GetWiatPayAnalysisStat'
+      }
       this.loading = true
       this.apipost(
         url,

src/components/SalesModule/enrollTotal.vue

@@ -349,14 +349,7 @@
                 <i class="iconfont icon-tiaozheng" style="font-size: 22px; color: #297bef"></i></el-tooltip>
             </p>
             <p class="fz12 over_ellipsis" style="width: 100%; text-decoration: underline; cursor: pointer"
-              :title="item.alName" @click="
-                goUrlX(
-                  '产品查询',
-                  item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',
-                  item.tcid,
-                  item.tcnum
-                )
-              ">
+              :title="item.alName" @click="gotoProduct(item)">
               {{ item.tcnum }}
             </p>
             <p class="fz12 over_ellipsis" style="width: 100%">
@@ -1125,6 +1118,21 @@
           (err) => {}
         );
       },
+      gotoProduct(item) {
+        var path = "productQuery";
+        if (item.teamType == 2) {
+          path = "productQueryOne";
+        } else if (item.teamType == 4) {
+          path = "priceGroup";
+        } else {
+          path = "productQuery";
+        }
+        var ntcnum = item.tcnum;
+        if (ntcnum && ntcnum.indexOf('（') > -1) {
+          ntcnum = ntcnum.substring(0, ntcnum.indexOf('（'));
+        }
+        this.goUrlX('产品查询', path, item.tcid, ntcnum)
+      },
       goUrlX(name, path, id, tcmun) {
         this.$router.push({
           name: path,
@@ -1349,7 +1357,7 @@
         this.msg.CEndDate = this.$route.query.CEndDate
         if (this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
       }
-      if (this.$route.query.BranchId &&this.$route.query.BranchId >= -1) {
+      if (this.$route.query.BranchId && this.$route.query.BranchId >= -1) {
         this.msg.BranchId = Number(this.$route.query.BranchId);
       }
       if (this.$route.query.isNormal) this.msg.isNormal = this.$route.query.isNormal

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -749,11 +749,21 @@
       },
       //跳转到团控列表
       goToTravelList(item) {
+        var path = "TravelControlList";
         if (item.teamType == 1) {
-          this.goUrlX('团控列表', 'TravelControlListSale', item.tcid, item.tcnum);
+          path = "TravelControlListSale";
+        } else if (item.teamType == 2) {
+          path = "oneDayTrip";
+        } else if (item.teamType == 4) {
+          path = "TravelTeam";
         } else {
-          this.goUrlX('团控列表', 'TravelControlList', item.tcid, item.tcnum);
+          path = "TravelControlList";
         }
+        var ntcnum = item.tcnum;
+        if (ntcnum && ntcnum.indexOf('（') > -1) {
+          ntcnum = ntcnum.substring(0, ntcnum.indexOf('（'));
+        }
+        this.goUrlX('团控列表', path, item.tcid, ntcnum);
       },
       goUrlHappy(item) {
         this.$router.push({

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -562,7 +562,7 @@
         <li>
           <span>
             <em>{{ $t("visa.v_tuanhao") }}</em>
-            <el-input v-model="msg.TCID" class="w150" clearable></el-input>
+            <el-input v-model="msg.TCNUM" class="w150" clearable></el-input>
           </span>
         </li>
         <li>
@@ -694,8 +694,8 @@
               <div class="p20">
                 <div class="mb title"><i class="iconfont icon-jiage"></i><span>{{$t('visa.v_tuanweiinfo')}}</span></div>
                 <div class="mb bold"><span class="item-title">{{$t('visa.v_currentseat')}}：</span>
-                   <template v-if="item.SurplusSeat>0">{{item.SurplusSeat}}</template>
-                   <template v-else>0</template>
+                  <template v-if="item.SurplusSeat>0">{{item.SurplusSeat}}</template>
+                  <template v-else>0</template>
                 </div>
                 <div class="mb bold"><span class="item-title">{{$t('visa.v_yibaoru')}}：</span>{{item.JoinNum}}
                   <span class="TCL-redType"
@@ -704,8 +704,8 @@
                 <div class="mb bold"><span class="item-title">{{$t('Operation.Op_takeSeat')}}：</span>{{item.Occupied}}
                 </div>
                 <div class="mb bold"><span class="item-title">{{$t('visa.v_houbu')}}：
-                     <template v-if="item.SurplusSeat<0">{{item.SurplusSeat*-1}}</template>
-                   <template v-else>0</template>
+                    <template v-if="item.SurplusSeat<0">{{item.SurplusSeat*-1}}</template>
+                    <template v-else>0</template>
                   </span> </div>
 
               </div>
@@ -1006,7 +1006,7 @@
         msg: {
           pageIndex: 1,
           pageSize: 10,
-          TCID: "",
+          TCNUM: "",
           StartTime: "",
           EndTime: "",
         },
@@ -1099,6 +1099,13 @@
         this.currentPage = 1;
       },
     },
+    created() {
+      if (this.$route.query) {
+        if (this.$route.query.tcmun) {
+          this.msg.TCNUM = this.$route.query.tcmun;
+        }
+      }
+    },
     mounted() {
       let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
       this.msg.StartTime = StartDate

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -100,6 +100,13 @@
                 @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
+          <li>
+            <span>
+              <em>{{ $t("visa.v_tuanhao") }}</em>
+              <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150"
+                @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')" clearable></el-input>
+            </span>
+          </li>
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
@@ -123,16 +130,16 @@
                 @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li> -->
-          <li>
+          <!-- <li>
             <span>
               <em>{{$t('objFill.v101.hezuohuoban')}}:</em>
               <el-input maxlength="50" v-model="queryMsg.QCustomerName" class="permiss-input w150" clearable
                 @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
-          </li>
+          </li> -->
           <li>
             <span>
-              <em>{{$t('sm.chufadi')}}:</em>
+              <em>{{$t('sm.chufadi')}}</em>
               <el-input v-model="queryMsg.StartAddress" class="permiss-input w150" clearable
                 @keyup.native.enter="resetQuery" :placeholder="$t('objFill.qingshurcfddian')"></el-input>
             </span>
@@ -246,9 +253,9 @@
                   <div class="mb bold">
                     <span class="item-title">{{$t('Airticket.Air_EconomyClass')}}:</span>
                     <span>{{item.YSeat}} <span class="item-title ml">
-                      {{$t('hotel.hotel_remainList')}}:</span>{{item.SurplusYSeatNum}}
-                       <font>{{$t("visa.v_houbu")}}:{{item.WatingNum}}</font>
-                      </span>
+                        {{$t('hotel.hotel_remainList')}}:</span>{{item.SurplusYSeatNum}}
+                      <font>{{$t("visa.v_houbu")}}:{{item.WatingNum}}</font>
+                    </span>
                   </div>
                   <div class="mb bold"><span class="item-title">{{$t('Airticket.Air_businessClass')}}:</span><span>
                       {{item.CSeat}} <span
@@ -517,6 +524,9 @@
                       <el-dropdown-item @click.native="gotoPay(item)">
                         {{$t('objFill.v101.baojijiesuan')}}
                       </el-dropdown-item>
+                      <el-dropdown-item @click.native="goTeamBalance(item.TCID, item.OutBranchId)">
+                        {{ $t("Operation.Op_shouzhiDetail") }}
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -571,6 +581,7 @@
           QFlightNum: "", //航班号
           QCustomerName: "", //合作伙伴名称
           StartAddress: "", //出发地
+          TCNUM: "", //团队编号
         },
         queryDataObj: {
           LineList: [], //线路列表
@@ -663,6 +674,18 @@
           );
         })
       },
+      goTeamBalance(id, OutBranchId) {
+        this.$router.push({
+          name: "TeamBalancePayment",
+          query: {
+            id: id,
+            OutBranchId: OutBranchId,
+            IsHaveAuth: true,
+            blank: "y",
+            tab: "团队收支明细",
+          },
+        });
+      },
       //跳转到报名清单
       gotoPay(item) {
         this.OpenNewPage('/TravelPay', {
@@ -753,6 +776,11 @@
     created() {
       this.CurrentUserInfo = this.getLocalStorage();
       this.getLineList();
+      if (this.$route.query) {
+        if (this.$route.query.tcmun) {
+          this.queryMsg.TCNUM = this.$route.query.tcmun;
+        }
+      }
     }
   };