1

src/pages/financial/EasyReport.vue

@@ -34,7 +34,7 @@
     */
 </style>
 <template>
-  <div class="page_EasyReport My_table_tell" v-loading="AALloading">
+  <div class="page_EasyReport My_table_tell page-body" v-loading="AALloading">
     <div class="page_EasyReport_set clearfix">
       <el-form class="clearfix page_EasyReport_form" label-width="110px">
         <el-row style="padding:15px 0 0 0;">
@@ -923,6 +923,7 @@
 
             }
             else if(Number(this.year)>2019){
+              console.log(rowData)
               let CostIds="";
               CostIds=rowData.CostIds.replace('112,', '');
               CostIds=CostIds.replace('16,', '');

src/pages/financial/JumpReport.vue

@@ -728,6 +728,7 @@
           IsFormEasyReport:1,
           Sort:'2',
           EmployeeId:'',
+          IsSellOrderForm:1
         },
         getCompanyMsg:{  // 公司
           RB_Group_Id:'0',
@@ -794,7 +795,7 @@
         loading2:false,
         tableData: [],
         columns: [
-          {field: 'BranchName', title: '所属公司', width: 80, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-BranchName'},
+          {field: 'BranchName', title: '所属校区', width: 80, titleAlign: 'left',columnAlign:'left',isResize:true,},
           {field: 'FrID', title: '单号', width: 80, titleAlign: 'left',columnAlign:'left',isResize:true,  //orderBy排序 asc 升序  desc降序
             // filterMultiple: true,  // 筛选项是否多选
             // filters: [
@@ -804,9 +805,37 @@
             result:[],  //筛选项默认值  单选传字符串'1'  多选数组 [1,2,2]
             type:'select',// 筛选项方式 select 下拉 check 单选、多选 text搜索 datetime时间
             isFrozen:true,
-            componentName:'table-BillRVB'
+            // componentName:'table-BillRVB',
+            formatter: function (rowData,rowIndex,pagingIndex,field) {
+
+              return `<span slot="reference" @click="rowData.modelShow = true" style="text-decoration: underline;cursor: pointer;font-weight: bold" >${rowData.FrID}</span>`;
+            },
           },
-          {field: 'custome-RecPay', title: '单据类型', width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-RecPay'},
+          {field: 'custome-RecPay', title: '单据类型', width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,
+
+            formatter: function (rowData,rowIndex,pagingIndex,field) {
+            if(rowData.Type==1){
+              return `<span  style="display: inline-block;
+                padding: 2px 8px;
+                color: white;
+                background-color: #2BB87C;
+                line-height: 16px;
+                border-radius: 4px;">
+                收入
+            </span>`
+            }else {
+              return ` <span  style="display: inline-block;
+                padding: 2px 8px;
+                color: white;
+                background-color: #E95252;
+                line-height: 16px;
+                border-radius: 4px;">
+                支出
+            </span>`
+            }
+
+            },
+            },
           {field: 'custome-Info', title: '关联信息', width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,result:'',filterMultiple:false,type:'text',componentName:'table-Info'},
           {field: 'dateRange', title: '费用类型', width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,result:{},filterMultiple:false,type:'datetime',componentName:'table-CostType'},
           {field: 'TradeWay', title: '交易方式',width: 210, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-TradeWay'},

src/pages/financial/TeamRevenueReport.vue

@@ -413,7 +413,7 @@
 </style>
 
 <template>
-  <div class="My_table_tell page_fnDm page_RecPayQuery PAGE_teamRE" v-loading="AALloading">
+  <div class="My_table_tell page_fnDm page_RecPayQuery PAGE_teamRE page-body" v-loading="AALloading">
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="110px">
         <el-row style="padding:15px 20px 0 0;">
@@ -928,7 +928,7 @@
           {
             field: "SchoolName",
             title: "校区",
-            width: 120,
+            width: 80,
             titleAlign: "left",
             columnAlign: "left",
             isResize: true,
@@ -949,7 +949,7 @@
           {
             field: "",
             title: "班级",
-            width: 150,
+            width: 120,
             titleAlign: "left",
             columnAlign: "left",
             isResize: true,
@@ -998,7 +998,7 @@
           {
             field: "CourseName",
             title: "课程",
-            width: 200,
+            width: 150,
             titleAlign: "left",
             columnAlign: "left",
             isResize: true,
@@ -1009,7 +1009,7 @@
           {
             field: "TeacherName",
             title: "教师",
-            width: 80,
+            width: 70,
             titleAlign: "left",
             columnAlign: "left",
             isResize: true,
@@ -1209,7 +1209,6 @@
       };
     },
     created() {
-      this.msg.SchoolId =0
       this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
       this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
       this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
@@ -1883,6 +1882,7 @@
           this.loading = true;
 
           this.total = res.Data.pageModel.Count;
+          console.log(this.total)
           let data = res.Data.pageModel.PageData;
           this.UpdateStaus=res.Data.Status;
           this.UpdateStartTime=res.Data.UpdateTime;