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

src/pages/financial/EasyReport.vue

@@ -50,8 +50,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="学校：">
-              <el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getData(2)">
+            <el-form-item label="校区：">
+              <el-select class="w150"  v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getData(2)">
                 <el-option label="不限" :value="-1"></el-option>
                 <el-option v-for="item in BranchList" :label="item.SName" :key="item.SId" :value="item.SId">{{item.SName}}</el-option>
               </el-select>

src/pages/financial/TeamRevenueReport.vue

@@ -1302,7 +1302,7 @@
       },
       rowClick(rowIndex,rowData,column){
         //新加跳入班级收支查询
-        if(column.title=='班级' && column.ClassId>0){
+        if(column.title=='班级' && rowData.ClassId>0){
           this.$router.push({
             path: '/course/paymentDetail',
             query: {