权限提交

src/pages/financial/EasyReport.vue

@@ -881,7 +881,8 @@
           endDate=that.year+"-"+column.end
         }
         console.log(rowIndex,rowData,'rowIndex')
-        if(rowIndex<9){
+        // if(rowIndex<9){
+        if(rowIndex<8){
           // 联运收入
           // if(rowData.ZhaiYao=="联运收入"){
           //   that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")

src/pages/financial/JumpReport.vue

@@ -122,13 +122,13 @@
               </el-form-item>
           </el-col> -->
           <el-col :span="4">
-            <el-form-item label="所属公司：">
+            <el-form-item label="所属校区：">
               <el-select  filterable  v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()"  class="">
                 <el-option :value="-1" label="不限"></el-option>
                 <el-option v-for='item in CompanyList'
-                           :label='item.BName'
-                           :value='item.Id'
-                           :key='item.Id'>
+                           :label='item.SName'
+                           :value='item.SId'
+                           :key='item.SId'>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -285,16 +285,16 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="发团日期：">
-                <el-date-picker class="h34"
-                                v-model="missionDate"
-                                @change="timeAdd(4)"
-                                type="daterange"
-                                value-format="yyyy-MM-dd">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="发团日期：">-->
+<!--                <el-date-picker class="h34"-->
+<!--                                v-model="missionDate"-->
+<!--                                @change="timeAdd(4)"-->
+<!--                                type="daterange"-->
+<!--                                value-format="yyyy-MM-dd">-->
+<!--                </el-date-picker>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </template>
         </el-row>
       </el-form>
@@ -334,6 +334,9 @@
   import myBill from "./components/BillModule.vue";
   import myrbvBill from "./components/ReceivablesModule.vue";
   import myhrBill from "./components/MergeBillModule.vue";
+  import {
+    getSchoolDropdown, //获取校区列表
+  } from '../../api/school/index';
   import Vue from 'vue'
   // 自定义列组件
   Vue.component('table-BranchName',{  //查看操作按钮
@@ -1191,11 +1194,25 @@
         }, err => {})
       },
       getCompanyList(){ //获取公司列表
-        this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
-          if(res.data.resultCode==1){
-            this.CompanyList=res.data.data;
-          }else{}
-        },err=>{})
+        // this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
+        //   if(res.data.resultCode==1){
+        //     this.CompanyList=res.data.data;
+        //   }else{}
+        // },err=>{})
+
+        getSchoolDropdown({}).then(res => {
+          if (res.Code == 1) {
+            var tempArray = res.Data;
+            // if (!tempArray) {
+            //   tempArray = [];
+            // }
+            // tempArray.unshift({
+            //   SId: 0,
+            //   SName: "不限"
+            // })
+            this.CompanyList = tempArray;
+          }
+        })
       },
       Financial_post_GetConditionList(){ //获取财务单据枚举列表
         this.apipost('Financial_post_GetConditionList',{},res=>{

src/pages/financial/TeamRevenueReport.vue

@@ -419,7 +419,7 @@
         <el-row style="padding:15px 20px 0 0;">
           <el-col :span="4">
             <el-form-item label="校区:">
-              <el-select class="w150"  v-model="msg.SchoolId" filterable :placeholder="$t('pub.pleaseSel')" @change="getPageList()">
+              <el-select class="w150" :disabled="!isHavePriceAction"  v-model="msg.SchoolId" filterable :placeholder="$t('pub.pleaseSel')" @change="getPageList()">
                 <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>
@@ -567,6 +567,9 @@
 <script>
   import moment from 'moment'
   import Vue from "vue";
+  import {
+    mapState
+  } from "vuex";
   import XLSX from "xlsx";
   // import downloadExcelEasy from "./utils/downloadExcelEasy";
   import {
@@ -1206,8 +1209,7 @@
       };
     },
     created() {
-      console.log(this.$route.query)
-      console.log('222')
+      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):'';
@@ -1274,6 +1276,13 @@
         this.msg.DataType="6";
       }
       let userInfo = this.getLocalStorage();
+      if(userInfo.School_Id>0){
+        this.msg.SchoolId =userInfo.School_Id
+      }else {
+        this.msg.SchoolId = -1
+
+      }
+
       if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
         this.isShowType = false;
         this.msg.DataType='2';
@@ -1285,6 +1294,19 @@
       }
 
     },
+    computed: mapState({
+      isHavePriceAction(state) {
+        if (state.user.userInfo.ActionMenuList) {
+          let action = state.user.userInfo.ActionMenuList.find(x => {
+            if (x.FunctionCode == "SelectAllSchool") {
+              return x;
+            }
+          });
+          return action && action.FunctionCode;
+        }
+        return false;
+      }
+    }),
     mounted() {
 
       this.getPageList()
@@ -1862,6 +1884,9 @@
 
           this.total = res.Data.pageModel.Count;
           let data = res.Data.pageModel.PageData;
+          this.UpdateStaus=res.Data.Status;
+          this.UpdateStartTime=res.Data.UpdateTime;
+
           if (this.total == 0) {
             this.DataList = [];
           } else {