简易报表等

src/assets/common/lang/zh.js

@@ -766,9 +766,7 @@ export const fnc = {
   fnc_tfsrhj: '团费收入合计',
   fnc_zksr: '直客收入',
   fnc_thjksr: '同行交客收入',
-  fnc_plattev: '平台收入',
-  
-  
+  fnc_plattev: '平台收入',  
   acc: '账户',
   accBming: '账户别名：',
   accType: '账户类型：',

src/assets/css/cssReset.css

@@ -481,6 +481,11 @@ vertical-align:middle
         overflow:auto;
         padding: 0 20px;
     }
+   
+    .column-cell-class-name-test-red .v-table-body-cell{
+        background-color:#e95252;
+        color:#fff;
+    }
     .column-cell-class-name-test .v-table-body-cell{
         background-color: yellow;
     }

src/components/FinancialModule/RecPayQueryTeam.vue

@@ -365,7 +365,8 @@ export default {
             EmployeeId:0,
             noData:false,
         }
-    },created(){
+    },
+    created(){
         var date = new Date().Format("yyyy-MM-dd");
         var arr = date.split('-');
         var year = arr[0]; //获取当前日期的年份
@@ -389,11 +390,21 @@ export default {
             month2 = '0' + month2;
         }
         var t2 = year2 + '-' + month2 + '-' + day2;
-        this.defaultMonth[0] = t2;
-    },components: {
+        this.msg.RB_Branch_Id=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.RB_Branch_Id;
+        if(this.$route.query.startDate){     
+            this.defaultMonth[0]=this.$route.query.startDate;
+            this.defaultMonth[1]=this.$route.query.endDate;
+        }else{
+            this.defaultMonth[0] = t2;
+        }
+
+
+    },
+    components: {
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,
-    },mounted(){
+    },
+    mounted(){
         let userInfo=this.getLocalStorage();
         this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
         this.EmployeeId = userInfo.EmployeeId;
@@ -416,7 +427,7 @@ export default {
                 this.msg.CStartDate = '2019-01-01';
                 this.msg.QEndDate = '';
             }
-            if(!this.msg.RB_Branch_Id&&this.msg.RB_Branch_Id!=0)this.msg.RB_Branch_Id=-1;
+            if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
             if(!this.msg.RB_Department_Id)this.msg.RB_Department_Id=0;
             if(!this.msg.EnterID)this.msg.EnterID=0;
             if(!this.msg.OrderId)this.msg.OrderId=0;
@@ -496,7 +507,9 @@ export default {
                 this.msg.CStartDate = '2019-01-01';
                 this.msg.QEndDate = '';
             }
-            if(!this.msg.RB_Branch_Id&&this.msg.RB_Branch_Id!=0)this.msg.RB_Branch_Id=-1;
+            if(!this.msg.RB_Branch_Id&&this.msg.RB_Branch_Id!=0){
+                this.msg.RB_Branch_Id=-1;
+            }
             if(!this.msg.RB_Department_Id)this.msg.RB_Department_Id=0;
             if(!this.msg.EnterID)this.msg.EnterID=0;
             if(!this.msg.OrderId)this.msg.OrderId=0;

src/components/FinancialModule/RecPayQueryTeamV2.vue

@@ -376,7 +376,13 @@ export default {
             month2 = '0' + month2;
         }
         var t2 = year2 + '-' + month2 + '-' + day2;
-        this.defaultMonth[0] = t2;
+        this.msg.RB_Branch_Id=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.RB_Branch_Id;
+        if(this.$route.query.startDate){     
+            this.defaultMonth[0]=this.$route.query.startDate;
+            this.defaultMonth[1]=this.$route.query.endDate;
+        }else{
+            this.defaultMonth[0] = t2;
+        }
     },components: {
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -393,6 +393,19 @@ tr._item_list td:last-child {
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="110px">
         <el-row style="padding:15px 20px 0 0;">
+          <el-col :span="4">
+            <el-form-item label="联运公司：">
+              <el-select :disabled="BranchStatus" filterable v-model="msg.Is_Transport" class>
+                <el-option :value="-1" label="不限"></el-option>
+                <el-option
+                  v-for="item in CompanyList"
+                  :label="item.BName"
+                  :value="item.Id"
+                  :key="item.Id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label="出团公司：">
               <el-select filterable v-model="msg.OutBranchId" class>
@@ -622,6 +635,7 @@ export default {
         pageIndex: 1,
         pageSize: 18,
         OutBranchId: "",
+        Is_Transport:"",
         StartCityId: "",
         LineId: "",
         LineTeamId: "",
@@ -1205,10 +1219,21 @@ export default {
       ],
       footer: [],
       pageSize: 6,
-      pageIndex: 1
+      pageIndex: 1,
+      BranchStatus:true,
     };
   },
-  created() {},
+  created() {
+     this.msg.Is_Transport=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
+    if(this.$route.query.startDate){     
+      this.productionDate[0]=this.$route.query.startDate;
+      this.productionDate[1]=this.$route.query.endDate;
+      this.msg.startDate=this.$route.query.startDate;
+      this.msg.endDate=this.$route.query.endDate;
+    }
+    // console.log(this.productionDate);
+    // console.log(this.msg.Is_Transport);
+  },
   components: {},
   mounted() {
     let allH, allW, cH, cW;
@@ -1217,6 +1242,9 @@ export default {
     cW = allW - 90;
     cH = allH - 350;
     this.msg.pageSize = parseInt(cH / 30) - 1;
+    if(this.msg.pageSize<0){
+      this.msg.pageSize=10;
+    }
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
     this.userId = userInfo.EmployeeId;
@@ -1655,8 +1683,10 @@ export default {
     getPageList() {
       // 获取列表数据
       this.loading = true;
-      if (!this.msg.OutBranchId && this.msg.OutBranchId !== 0)
+      if (!this.msg.OutBranchId)
         this.msg.OutBranchId = -1;
+      if(!this.msg.Is_Transport&&this.msg.Is_Transport!==0)
+        this.msg.Is_Transport=-1;
       if (!this.msg.StartCityId) this.msg.StartCityId = 0;
       if (!this.msg.LineId) this.msg.LineId = 0;
       if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
@@ -1667,6 +1697,13 @@ export default {
         this.msg,
         res => {
           if (res.data.resultCode == 1) {
+            // console.log(res);
+            let BranchStatus=res.data.data.IsBranchButton;
+            if(BranchStatus==-1){
+              this.BranchStatus=false;
+            }else{
+              this.BranchStatus=true;
+            }
             let data = res.data.data.pmodel.pageData;
             // res.data.data.TotalRevenue
             this.total = res.data.data.pmodel.count;
@@ -1699,11 +1736,11 @@ export default {
             this.loading = false;
             this.$message.error(res.data.message);
           }
-          if ((this.msg.OutBranchId = -1)) this.msg.OutBranchId = -1;
-          if (!this.msg.StartCityId) this.msg.StartCityId = 0;
-          if (!this.msg.LineId) this.msg.LineId = 0;
-          if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
-          if (!this.msg.TCID) this.msg.TCID = "";
+          //if ((this.msg.OutBranchId = -1)) this.msg.OutBranchId = -1;
+          // if (!this.msg.StartCityId) this.msg.StartCityId = 0;
+          // if (!this.msg.LineId) this.msg.LineId = 0;
+          // if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
+          // if (!this.msg.TCID) this.msg.TCID = "";
         },
         err => {}
       );

src/components/FinancialModule/priceIncomeConfirmList.vue

@@ -57,32 +57,33 @@
       </div>
         <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
       <tr>
-        <th>{{$t('scen.sc_temID')}}</th>
-        <th>{{$t('admin.admin_Department')}}</th>
-        <th>{{$t('fnc.danhao')}}</th>
+        <th>{{$t('scen.sc_temID')}}</th>       
+        <th>线路系列</th>       
         <th>{{$t('visa.v_tuanhao')}}</th>
+        <th>{{$t('scen.sc_ftTime')}}</th>
+        <th>{{$t('admin.admin_Department')}}</th>
         <th>{{$t('admin.admin_personNumber')}}</th>
         <th>{{$t('leader.leader_Leader')}}</th>
-        <th>{{$t('fnc.fnc_tfsrhj')}}</th>
+        <th>{{$t('fnc.fnc_tfsrhj')}} </th>
         <th>{{$t('fnc.fnc_zksr')}}</th>
         <th>{{$t('fnc.fnc_thjksr')}}</th>
         <th>{{$t('fnc.fnc_plattev')}}</th>
-        <th>{{$t('scen.sc_ftTime')}}</th>
         <th>{{$t('admin.admin_czPerson')}}</th>
         <th>{{$t('hotel.table_operattime')}}</th>
       </tr>
       <tr v-for="item in tableList" :key="item.Id">
         <td><span  @click='goUrl("priceIncomeConfirmInfo",item.TCID,"收入确认单")' style="cursor:pointer;text-decoration: underline">{{item.TCID}}</span></td>
+        <td>{{item.LineName}}</td> 
+        <td>{{item.TCNUM}}</td>        
+        <td>{{item.StartDate}}</td> 
         <td>{{item.DepartmentName}}</td>
-        <td>{{item.Id}}</td>
-        <td>{{item.TCNUM}}</td> 
         <td>{{item.PeopleNum}}</td>
         <td>{{item.LeaderName}}</td>
         <td>{{item.TotalIncome}}</td>
         <td>{{item.DirectGuestIncome}}</td>
         <td>{{item.PlatformGuestIncome}}</td>
         <td>{{item.PlatformIncome}}</td>  
-        <td>{{item.StartDate}}</td>  
+         
         <td>{{item.EmpName}}</td>
         <td>{{item.DateTimeStr}}</td>
       </tr>
@@ -98,7 +99,7 @@
 
 
 <script>
-
+import moment from "moment";
 export default {
 
   data () {
@@ -112,7 +113,7 @@ export default {
             LineId:0,
             LineteamId:0,
             TCNUM:"",
-            StartDate:"",
+            StartDate:moment().format("YYYY-MM-DD"),
             EndDate:"",
             currentPage:1,
         },

src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue

@@ -50,7 +50,7 @@
         padding:10px;
     }
     .priceContent .pri_EmpName{
-        float:left;
+        float:left ;
         margin-left:20px;
     }
     .priceContent .pri_DateTime{

src/plug/index.js

@@ -118,9 +118,9 @@ export default {
         let domainUrl = '';
         let locationName = window.location.hostname;
         // domainUrl = "http://192.168.2.65:8025"; //214主域名
-        domainUrl = "http://192.168.2.214:8082"; //214主域名
+        // domainUrl = "http://192.168.2.214:8082"; //214主域名
         // domainUrl = "http://192.168.0.119:8082";
-        // domainUrl = "http://192.168.2.16:8083";
+        domainUrl = "http://192.168.2.16:8083";
         if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
         } else if (locationName.indexOf('viitto') !== -1) {

src/router/config.js

@@ -2295,7 +2295,7 @@ export default {
             },
             { //财务 财务单据 应付团款查询
               path: '/RecPayQueryTeamV2',
-              name: '/RecPayQueryTeamV2',
+              name: 'RecPayQueryTeamV2',
               component: resolve => require(['@/components/FinancialModule/RecPayQueryTeamV2'], resolve),
               meta: {
                 title: '应付团款查询'