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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -844,6 +844,11 @@ Vue.component("TCIDJump", {
             path: "/oneDayTrip" ,
             query: { id: id, blank: "y" }
           });
+      }else if(row.TeamType==4){
+        this.$router.push({
+            path: "/TravelTeam" ,
+            query: { tcmun: row.TCNUM, blank: "y" }
+        });
       }else if(row.DataType!=17&&row.DataType!=18&&row.DataType!=19){
         this.$router.push({
           path: "/" + path,
@@ -1089,6 +1094,11 @@ Vue.component("TCNUMJump", {
             path: "/TravelControlListSale" ,
             query: { tcmun: row.TCNUM, blank: "y" }
           });
+      }else if(row.TeamType==4){
+        this.$router.push({
+            path: "/TravelTeam" ,
+            query: { tcmun: row.TCNUM, blank: "y" }
+        });
       }else if(row.TeamType==0){//常规团列表
         this.$router.push({
           path: "/TravelControlList" ,

src/components/FinancialModule/ReportForm/TeamRevenueReport2.vue

@@ -471,10 +471,10 @@ tr._item_list td:last-child {
               <el-select :disabled="BranchStatus" filterable v-model="msg.OutBranchId" class @change="getChange">
                 <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
                 <el-option
-                  v-for="item in CompanyList"
+                  v-for="(item,index) in CompanyList"
                   :label="item.BName"
                   :value="item.Id"
-                  :key="item.BName"
+                  :key="index"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -484,10 +484,10 @@ tr._item_list td:last-child {
               <el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId" class  @change="getChange">
                 <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
                 <el-option
-                  v-for="item in coinGetList"
+                  v-for="(item,index) in coinGetList"
                   :label="item.Name"
                   :value="item.ID"
-                  :key="item.ID"
+                  :key="index"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -497,10 +497,10 @@ tr._item_list td:last-child {
               <el-select filterable v-model="msg.StartCityId" class>
                 <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
                 <el-option
-                  v-for="item in startCityList1"
+                  v-for="(item,index) in startCityList1"
                   :label="item.startCityName"
                   :value="item.ID"
-                  :key="item.startCityName"
+                  :key="index"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -510,10 +510,10 @@ tr._item_list td:last-child {
               <el-select filterable v-model="msg.LineId" @change="getLineTeamList(msg.LineId,-1),getLinePlaceList(msg.LineId)">
                 <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
                 <el-option
-                  v-for="item in LineList"
+                  v-for="(item,index) in LineList"
                   :label="item.LineName"
                   :value="item.LineID"
-                  :key="item.LineName"
+                  :key="index"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -704,6 +704,15 @@ tr._item_list td:last-child {
                 <el-option value="1" :label="$t('objFill.changguit')"></el-option>
                 <el-option value="2" :label="$t('objFill.xiaobaot')"></el-option>
                 <el-option value="3" :label="$t('MarketingActi.local')"></el-option>
+                <el-option value="5" label="PAK团"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" v-if="getCompanyMsg.RB_Group_Id==2 && (empBranchId==0 || empBranchId==1252)">
+            <el-form-item label="其他查询">
+              <el-select v-model="msg.SpecialType" class="w150">
+                <el-option value="0" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option value="1" :label="$t('objFill.zhikanbali')"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -1481,6 +1490,7 @@ export default {
       showID: false,
       active: 1,
       userId: 0,
+      empBranchId: -1,
       //是否显示
       isShowType:true,
       isShowGrounding:true,
@@ -2841,8 +2851,8 @@ export default {
         handler (val, oldVal) {
           if (this.$route.query.BranchId) {
             this.msg.OutBranchId = Number(this.$route.query.BranchId)
-            this.getPageList()
           }
+          this.financeinfo_post_GetList()
         },
         deep: true,
         immediate: true
@@ -2867,6 +2877,7 @@ export default {
     this.userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
     this.userId = userInfo.EmployeeId;
+    this.empBranchId = userInfo.RB_Branch_id;
     if (this.$route.query.BranchId) {
       this.msg.OutBranchId = this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
     }
@@ -2926,7 +2937,6 @@ export default {
 
     this.columnsOld = this.columns;
 
-    this.financeinfo_post_GetList()
     this.getCompanyList();
     this.getLineList();
     this.getStartList1();

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -926,11 +926,10 @@
       this.CurrentUserInfo = this.getLocalStorage();
       this.getLineList();
       let nowDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
-      this.queryMsg.SelectStartDate = nowDate;
       if (this.$route.query) {
         if (this.$route.query.tcmun) {
           this.queryMsg.TCNUM = this.$route.query.tcmun;
-        }
+        }else this.queryMsg.SelectStartDate = nowDate;
       }
     }
   };

src/router/config.js

@@ -4766,6 +4766,14 @@ export default {
               meta: {
                 title: '营收报表'
               },
+            },
+            { //财务 报表 团队营收报表
+              path: '/TeamRevenueReport2',
+              name: 'TeamRevenueReport2',
+              component: resolve => require(['@/components/FinancialModule/ReportForm/TeamRevenueReport2'], resolve),
+              meta: {
+                title: '营收报表'
+              },
             }, { //财务 报表 变更报表
               path: '/ChangeRevenueReport',
               name: 'ChangeRevenueReport',