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

src/components/FinancialModule/CashAccount.vue

@@ -113,7 +113,8 @@
                                 <span>
                                     <span  v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
                                     <span  v-else>{{item.StandardCurrencyCode}}</span>
-                                    <span  class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
+                                    <!-- <span  class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span> -->
+                                    <span  class="fc_green PingFangSC _underline" @click="goUrlNew(item)">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>                                                                        
                                     <span class="iconfont icon-qiehuan" @click="item.showB=!item.showB" v-if="item.IsStandardCurrency!=1"></span>
                                     <span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
                                 </span>
@@ -436,6 +437,11 @@ export default {
             costType:[],
         }
     },methods:{
+        goUrlNew (item) {
+            // console.log(item);
+            let path="CashAccDetail";
+            this.$router.push({ name: path,query:{"TypeId":item.TypeId,'ID':item.ID, blank: "y",}}) 
+        },
         regNum(n,t){  // 判断数字    n 值 t 类型
             let reg = /^\d+(\.\d{0,6})?$/
             if(!n)return 0

src/components/FinancialModule/CompanyAccount.vue

@@ -148,7 +148,8 @@
                                 <span> 
                                     <span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
                                     <span v-else>{{item.StandardCurrencyCode}}</span> 
-                                    <span  class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span> 
+                                    <!-- <span  class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>  -->
+                                    <span  class="fc_green PingFangSC _underline" @click="goUrlNew(item)">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>                                    
                                     <span class="iconfont icon-qiehuan" @click="item.showB=!item.showB" v-if="item.IsStandardCurrency!=1"></span> 
                                     <span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
                                 </span>
@@ -338,6 +339,16 @@
                             <el-input v-model="addMsg.RiskLowerLimitMoney" type="number" class=""></el-input>
                         </el-form-item> 
                     </el-col> 
+                    <el-col :span="4" :gutter="35">
+                        <el-form-item label="初始本位币金额">
+                        <el-input v-model="addMsg.AccountStartWBMoney" type="number" class></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4" :gutter="35">
+                        <el-form-item label="初始原币金额">
+                        <el-input v-model="addMsg.AccountStartMoney" type="number" class></el-input>
+                        </el-form-item>
+                    </el-col>
                 </el-row>      
             </el-form>
         </div>    
@@ -421,7 +432,9 @@ export default {
                 BranchIdS:0,
                 OutCharge:0,
                 InCharge:0,
-                RiskLowerLimitMoney:''
+                RiskLowerLimitMoney:'',
+                AccountStartMoney:0,
+                AccountStartWBMoney:0,
             },
             getCompanyMsg:{
                 RB_Group_Id:'0',
@@ -575,6 +588,11 @@ export default {
                 this.showEmployeeList2 = [];
             }
         },
+        goUrlNew (item) {
+            console.log("1223",item)
+            let path="CompanyAccDetail";
+            this.$router.push({ name: path,query:{"TypeId":item.TypeId,'ID':item.ID, blank: "y",}}) 
+        },
         goUrl (path,id,name,source,CurrencyId) {
             this.$router.push({ name: path,query:{"id":id,'name':name,'source':source,'CurrencyId':CurrencyId}}) 
         },
@@ -658,7 +676,9 @@ export default {
                 BranchIdS:0,
                 OutCharge:0,
                 InCharge:0,
-                RiskLowerLimitMoney:''
+                RiskLowerLimitMoney:'',
+                AccountStartMoney:0,
+                AccountStartWBMoney:0,
             }
             this.SetProfitLossMsg={
                 ID:0,

src/components/FinancialModule/PlatformAccount.vue

@@ -231,6 +231,7 @@
       sort-always
       @sort-change="sortChange"
       @on-custom-comp='customCompFunc'
+      :row-click="rowClick" 
     ></v-table>
     <div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
       <el-row>
@@ -459,6 +460,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4" :gutter="35">
+            <el-form-item label="初始本位币金额">
+              <el-input v-model="addMsg.AccountStartWBMoney" type="number" class></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" :gutter="35">
+            <el-form-item label="初始原币金额">
+              <el-input v-model="addMsg.AccountStartMoney" type="number" class></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24" :gutter="35">
@@ -596,7 +607,10 @@ export default {
         Remark:'',
         BindBankID:null,
         HaveContract:'0',
-        ContraceDateRange:''
+        ContraceDateRange:'',
+        AccountStartMoney:0,
+        AccountStartWBMoney:0,
+
       },
       getCompanyMsg: {
         RB_Group_Id: "0",
@@ -708,6 +722,19 @@ export default {
     };
   },
   methods: {
+    rowClick(rowIndex,rowData,column){
+      let path='PlatformAccDetail';
+      if(column.title=="账户余额"){
+        this.$router.push({
+          name: path,
+          query: {
+            TypeId: rowData.TypeId,
+            ID:rowData.ID,
+            blank: "y",
+          }
+        });
+      }
+    },
     remoteQueryBankMethod(query){
       if(query!=''){
         this.remoteLoading=true
@@ -931,7 +958,6 @@ export default {
       this.getList();
     },
     filterMethod(filters) {
-      console.log("filter", filters);
       this.msg.Alias = filters.Alias;
       this.msg.RB_Branch_Id = filters.allName;
       this.msg.SettlementType =
@@ -1107,6 +1133,7 @@ export default {
             this.remoteMethod(data.InemName);
             this.remoteMethod2(data.OutemName);
             this.addMsg = data;
+            // console.log("this.addMsg",this.addMsg)
             this.addMsg.HaveContract = this.addMsg.HaveContract.toString()
             this.addMsg.SettlementType =this.addMsg.SettlementType.toString()
             this.addMsg.BindBankID = this.addMsg.BindBankID==-1?null:this.addMsg.BindBankID
@@ -1135,7 +1162,9 @@ export default {
         BranchIdS: 0,
         OutCharge: 0,
         InCharge: 0,
-        RiskLowerLimitMoney: ""
+        RiskLowerLimitMoney: "",
+        AccountStartMoney:0,
+        AccountStartWBMoney:0,
       };
       this.SetProfitLossMsg = {
         ID: 0,

src/components/FinancialModule/PoolAccount.vue

@@ -114,7 +114,8 @@
                                 <span>
                                     <span  v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
                                     <span  v-else>{{item.StandardCurrencyCode}}</span>
-                                    <span  class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
+                                    <!-- <span  class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span> -->
+                                    <span  class="fc_green PingFangSC _underline" @click="goUrlNew(item)">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>                                                                                                            
                                     <span class="iconfont icon-qiehuan" @click="item.showB=!item.showB" v-if="item.IsStandardCurrency!=1"></span>
                                     <span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
                                 </span>
@@ -432,6 +433,11 @@ export default {
             Charge:1
         }
     },methods:{
+        goUrlNew (item) {
+            console.log(item);
+            let path="PoolAccDetail";
+            this.$router.push({ name: path,query:{"TypeId":item.TypeId,'ID':item.ID, blank: "y",}}) 
+        },
         remoteMethod(query) {
             if (query !== '') {
                 this.loadingPeople = true

src/components/FinancialModule/ReportForm/LineReceiver.vue

+
+<style scoped>
+  .LineReceiver .el-form-item{
+      display: inline-block;
+  }
+
+</style>
+
+<template>
+  <div class="LineReceiver">
+      <div>
+          <el-form>
+              <el-form-item label="收客日期">
+                    <el-date-picker size="small"
+                        @change="timeAdd"
+                        v-model="productionDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        :range-separator="$t('restaurant.res_To')">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                    <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
+               </el-form-item>
+                
+          </el-form>
+      </div>
+      <div>
+          <el-table :data="List" stripe border>
+			<el-table-column fixed prop="BranchName" label="公司名称" min-width="100">
+			</el-table-column>
+			<el-table-column min-width="130" @sort-by="SortBy" sortable v-for='(item,index) in newArr' :prop='item.Rank' :label="item.title" :key='index'>
+				<template slot-scope="scope">
+					<p>{{scope.row[item.Rank]}} ({{scope.row[item.value]}})</p>
+				</template>				
+			</el-table-column>
+		</el-table>
+      </div>
+ 
+  </div>
+</template>
+
+<script>
+	import moment from "moment"
+	export default {
+		data (){
+            return{
+                productionDate:[],
+                msg:{
+                    StartTime:"",
+                    EndTime:"",
+                },
+                ColList:[],
+                List:[],
+                newArr:[],
+            }
+        },
+        created(){
+            let mon1=moment().format("YYYY-MM-DD");      
+            let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
+            this.productionDate=[mon2,mon1];
+            this.msg.StartTime=this.productionDate[0];
+            this.msg.EndTime=this.productionDate[1]; 
+        },
+		mounted(){
+			this.getList();
+		},
+		methods:{
+            SortBy(){
+                
+            },
+            timeAdd(){
+                if(!this.productionDate){
+                    this.msg.StartTime="";
+                    this.msg.EndTime="";
+                }else{
+                    this.msg.StartTime=this.productionDate[0];
+                    this.msg.EndTime=this.productionDate[1]; 
+                }
+            },
+            getList(){
+                this.apipost('financestatistics_post_GetCompanyLineGuestList',this.msg, res => {
+                    
+                    if(res.data.resultCode == 1) {
+                        this.ColList=res.data.data.ColList;
+                        this.List=res.data.data.List;
+                        console.log("this.ColList",this.ColList);
+                        console.log("this.List",this.List);
+                        for(let i = 1; i < this.ColList.length; i++) {
+							this.newArr.push({
+                                "Rank":this.ColList[i].Sort,
+								'value': this.ColList[i].Col,
+								"title": this.ColList[i].Name,
+							})
+                        }
+                        console.log("this.newArr",this.newArr);                        
+                        
+                    }else{
+                        this.Error(res.data.message);
+                    }
+                }, err => {})
+            },
+		}	
+	}
+
+
+
+		
+</script>
\ No newline at end of file

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -364,6 +364,7 @@
     </div>
 </template>
 <script>
+import moment from "moment"
 export default {
     data(){
         return{
@@ -446,7 +447,7 @@ export default {
           allWPrice:0,
         }
     },created(){
-      if(this.$route.query.TypeId){
+      if(this.$route.query.TypeId&&!this.$route.query.ID){
         this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
         this.accType = parseInt(this.$route.query.TypeId);
         this.msg.sTradeDate = this.$route.query.sTradeDate;
@@ -456,6 +457,23 @@ export default {
         this.getList();
         this.BankAccount_post_GetCashAccountList("query");
       }
+      if(this.$route.query.ID){
+        this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):'';      
+        this.AccountId=parseInt(this.$route.query.ID);
+        let mon1=moment().format("YYYY-MM-DD");      
+        let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
+        this.productionDate=[mon2,mon1];
+        this.msg.sTradeDate=mon2;
+        this.msg.eTradeDate=mon1;
+        this.msg.BankList=[];
+        this.msg.BankList.push({
+                    Type:this.Type,
+                    AccountId:this.AccountId
+                })
+        this.bankaccount_post_GetList();
+        this.getList();
+        
+    }
     },methods:{
         addChuNaFun(){  // 添加出纳按钮点击事件
             let count = 0;
@@ -798,7 +816,7 @@ export default {
             this.msg.QEndDate = this.productionDateByTC[1];
         },
         bankaccount_post_GetList(){  // 获取银行账户
-            this.AccountId = '';
+            // this.AccountId = '';
             let msg = {
                     TypeId:this.accType,
                     BranchId:-1,

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -331,6 +331,7 @@
     </div>
 </template>
 <script>
+import moment from "moment"
 export default {
     data(){
         return{
@@ -399,16 +400,33 @@ export default {
             allWPrice:0,
         }
     },created(){
-    if(this.$route.query.TypeId){
+    if(this.$route.query.TypeId&&!this.$route.query.ID){
       this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
       this.accType = parseInt(this.$route.query.TypeId);
-      this.msg.sTradeDate = this.$route.query.sTradeDate;
-      this.msg.eTradeDate = this.$route.query.eTradeDate;
+      this.msg.sTradeDate = this.$route.query.sTradeDate?this.$route.query.sTradeDate:"";
+      this.msg.eTradeDate = this.$route.query.eTradeDate?this.$route.query.eTradeDate:"";
       this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
       this.productionDateByTC=[this.msg.QStartDate, this.msg.QEndDate];
       this.getList();      
       this.bankaccount_post_GetListS("query");
     }
+    if(this.$route.query.ID){
+      this.accType = parseInt(this.$route.query.TypeId);      
+      this.AccountId=parseInt(this.$route.query.ID);
+      let mon1=moment().format("YYYY-MM-DD");      
+      let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
+      this.productionDate=[mon2,mon1];
+      this.msg.sTradeDate=mon2;
+        this.msg.eTradeDate=mon1;
+        this.msg.BankList=[];
+        this.msg.BankList.push({
+                    Type:this.Type,
+                    AccountId:this.AccountId
+                })
+      this.bankaccount_post_GetList();
+      this.getList();
+      
+    }
   },methods:{
         goUrl(path,id){
             this.$router.push({ name: path,query:{"id":id,blank:'y'} })
@@ -453,7 +471,7 @@ export default {
             this.msg.QEndDate = this.productionDateByTC[1];
         },
         bankaccount_post_GetList(){  // 获取银行账户
-            this.AccountId = '';
+            // this.AccountId = '';
             this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => {
                 if(res.data.resultCode == 1) {
                     let data = res.data.data;
@@ -487,7 +505,7 @@ export default {
             }, err => {})
         },
         getList(){ //获取列表
-            this.loading = true
+            // this.loading = true
             if( this.msg.ClientID == '' ){
                 this.msg.ClientID = 0;
             }
@@ -500,6 +518,8 @@ export default {
             }
             this.allMoney = '';
             this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
+              
+                this.loading = false;
                  if(res.data.resultCode==1){
                     let data = res.data.data;
                     if(data.length){
@@ -534,7 +554,7 @@ export default {
                      })
                    });
                     this.DataList = data
-                    this.loading = false;
+                    
                     if( this.msg.ClientID == 0 ){
                         this.msg.ClientID = '';
                     }

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -311,6 +311,7 @@
     </div>
 </template>
 <script>
+import moment from 'moment'
 export default {
     data(){
         return{
@@ -328,7 +329,7 @@ export default {
                 AccountNumber:''
             },
             Type:2,
-            AccountId:'',
+            AccountId:"",
             DataList:[],
             StartMoney:0,
             AccountTypeList:[],
@@ -380,7 +381,7 @@ export default {
           allWPrice:0,
         }
     },created(){
-    if(this.$route.query.TypeId){
+    if(this.$route.query.TypeId&&!this.$route.query.ID){
       this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
       this.accType = parseInt(this.$route.query.TypeId);
       this.msg.sTradeDate = this.$route.query.sTradeDate;
@@ -390,6 +391,23 @@ export default {
       this.getList();
       this.BankAccount_post_GetPlatformList("query");
     }
+    if(this.$route.query.ID){
+      this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):"";            
+      this.AccountId=parseInt(this.$route.query.ID);
+      let mon1=moment().format("YYYY-MM-DD");      
+      let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
+      this.productionDate=[mon2,mon1];
+      this.msg.sTradeDate=mon2;
+        this.msg.eTradeDate=mon1;
+        this.msg.BankList=[];
+        this.msg.BankList.push({
+                    Type:this.Type,
+                    AccountId:this.AccountId
+                })
+      this.bankaccount_post_GetList();                
+      this.getList();      
+
+    }
   },methods:{
         goUrl(path,id){
             this.$router.push({ name: path,query:{"id":id,blank:'y'} })
@@ -434,7 +452,7 @@ export default {
             this.msg.QEndDate = this.productionDateByTC[1];
         },
         bankaccount_post_GetList(){  // 获取平台账户
-            this.AccountId = '';
+            // this.AccountId = '';
             let msg = {
                 BackId:0,
                 TypeId:this.accType,

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -341,6 +341,7 @@
     </div>
 </template>
 <script>
+import moment from "moment"
 export default {
     data(){
         return{
@@ -410,7 +411,7 @@ export default {
           allWPrice:0,
         }
     },created(){
-    if(this.$route.query.TypeId){
+    if(this.$route.query.TypeId&&!this.$route.query.ID){
       this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
       this.accType = parseInt(this.$route.query.TypeId);
       this.msg.sTradeDate = this.$route.query.sTradeDate;
@@ -420,6 +421,24 @@ export default {
       this.getList();
       this.BankAccount_post_GetCashPoolList("query");
     }
+    if(this.$route.query.ID){
+        this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):0;      
+        this.AccountId=parseInt(this.$route.query.ID);
+        let mon1=moment().format("YYYY-MM-DD");      
+        let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
+        this.productionDate=[mon2,mon1];
+        this.msg.sTradeDate=mon2;
+        this.msg.eTradeDate=mon1;
+        this.msg.BankList=[];
+        this.msg.BankList.push({
+                    Type:this.Type,
+                    AccountId:this.AccountId
+                })
+        this.bankaccount_post_GetList();
+        this.getList();
+        
+    }
+
   },methods:{
         goUrl(path,id){
             this.$router.push({ name: path,query:{"id":id,blank:'y'} })
@@ -469,7 +488,7 @@ export default {
             this.msg.QEndDate = this.productionDateByTC[1];
         },
         bankaccount_post_GetList(){  // 获取银行账户
-            this.AccountId = '';
+            // this.AccountId = '';
             let msg = {
                     TypeId:this.accType,
                     BranchId:-1,
@@ -514,6 +533,7 @@ export default {
             this.endStartMoney = '';
             this.endRStartMoney ='';
             this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
+              
                  if(res.data.resultCode==1){
                     let data = res.data.data;
                     if(data.length){

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1430,12 +1430,15 @@ export default {
         getCompany(){ // 获取公司
             this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
                 let data = res.data.data;
+                let Status=false;
                 if(this.$route.query.companyID!=='-1' && this.$route.query.companyID!==undefined){
+                    Status=true;
                   data.forEach(x=>{
                     x.disabled = true;
                   })
                 }
                 if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length>0) {
+                    Status=true;                    
                   this.orderObj.companyIDList.forEach(x=>{
                     data.forEach(y=>{
                       if (y.disabled === false){
@@ -1447,6 +1450,30 @@ export default {
                   });
                 }
                 this.companyList = data;
+                if(!Status){
+                    let id=this.$route.query.id;
+                    this.apipost('FinancialFlowTemplate_post_GetTemplateBranch', {ID:id}, res => {
+                        if (res.data.resultCode == 1) {
+                            let resdata = res.data.data;
+                            if(resdata.IsGroupCommon==0){
+                                let BranchList=resdata.BranchList;
+                                data.forEach(x=>{
+                                    x.disabled=true;
+                                    BranchList.forEach(y=>{
+                                        if(x.Id==y){
+                                            x.disabled=false;
+                                        }
+                                    })
+                                })
+                               
+                                this.companyList = data;   
+                            }
+                        }
+                        
+                    }, err => {})
+                 
+                }
+                
             }, err => {})
         },
     },

src/components/Hotel/roomReservationsDetails.vue

@@ -305,6 +305,9 @@
         subItem.HotelId = 0;
         subItem.HotelName = "";
         subItem.OrderID = 0;
+        subItem.OrderDetailsList.forEach(childItem=>{
+          childItem.OrderDetailsId=0;
+        });
         item.HotelOrderList.push(subItem);
       },
       //删除酒店
@@ -492,7 +495,7 @@
             })
           });
         })
-        this.loading = true
+        this.loading = true;
         this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
           if (res.data.resultCode == 1) {
             this.getList();

src/components/administrative/statisticsCheckTime.vue

@@ -184,6 +184,7 @@
 						this.$nextTick(() => {
 							this.dataList = res.data.data.pageData;
 						 });
+						 console.log("res",res);
 						this.datesArr = res.data.data.columnData;
 						this.newArr.length = 0;
 						for(let i = 0; i < this.datesArr.length; i++) {
@@ -192,6 +193,7 @@
 								"title": this.datesArr[i].substring(this.datesArr[i].length - 2, this.datesArr[i].length) + '（' + this.getWeekByDay(this.datesArr[i]) + ')'
 							})
 						}
+						console.log("this.newArr",this.newArr)
 						this.total = res.data.data.count;
 					}
 

src/router/config.js

@@ -2733,6 +2733,14 @@ export default {
                             meta: {
                                 title: '简易报表'
                             },
+                        },
+                        { //财务 线路收客
+                            path: '/LineReceiver',
+                            name: 'LineReceiver',
+                            component: resolve => require(['@/components/FinancialModule/ReportForm/LineReceiver'], resolve),
+                            meta: {
+                                title: '线路收客'
+                            },
                         }, { //财务 报表 年度营收报表
                             path: '/YearReport',
                             name: 'YearReport',