修改页面

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -857,7 +857,6 @@ export default {
 
     },
     rowClick(rowIndex,rowData,column){
-  
       var that = this;
       let startDate=that.year+"-"+column.start;
       let endDate="";
@@ -918,8 +917,7 @@ export default {
         else if(rowData.ZhaiYao=="歐洲與南亞損失分攤"){
           that.goUrl("AirTicketLoss",startDate,endDate,BranchId,"机票分摊")
         }
-        else if(rowData.ZhaiYao=="营业外收入"){
-          
+        else if(rowData.ZhaiYao=="营业外收入" ||rowData.ZhaiYao=="其他营业支出"||rowData.ZhaiYao=="应收应付款"){
           if(that.msg.BranchId==1218){
             this.$router.push({
               path: "/JumpReport",
@@ -932,7 +930,22 @@ export default {
                 blank: "y" 
               }
             });
-          }else{
+          }
+          //网络印象
+          if(that.msg.BranchId==1224){
+            this.$router.push({
+              path: "/fxOrderProfitLossList",
+              query: { 
+                year:rowData.Year,
+                month:month,
+                BranchId:rowData.BranchId,
+                CostIds:rowData.CostIds,
+                "IsJapanNonbusinessIncome":1,
+                blank: "y" 
+              }
+            });
+          }
+          else{
             that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
           }
           

src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue

@@ -239,7 +239,7 @@
     name: "fxOrderProfitLossList",
     data() {
       return {
-        value: '',
+        value: [],
         msg: {
           pageIndex: 1,
           pageSize: 15,
@@ -267,6 +267,19 @@
       }
     },
     created() {
+       if(this.$route.query.year && this.$route.query.month)
+            {
+            this.msg.StartDate=this.$route.query.year+"-"+this.$route.query.month+"-01";
+            var d1=new Date(this.msg.StartDate); 
+            var d2=new Date(d1); 
+            d2.setMonth(d2.getMonth()+1); 
+            d2.setDate(d2.getDate()-1); 
+            var month = d2.getMonth()+1;
+            var day = d2.getDate();
+            this.msg.EndDate= d2.getFullYear()+'-'+month+'-'+day;
+            this.value[0]=this.msg.StartDate;
+            this.value[1]= this.msg.EndDate;
+      }
       this.getTotalOrderProfitLoss()
       this.getSupplierList()
       this.getCompanyUserList('')