1

src/pages/financial/accDetail/CashAccDetail.vue

@@ -125,9 +125,9 @@
               <el-select  filterable  v-model='msg.RB_Branch_Id' >
                 <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>
@@ -390,6 +390,7 @@
 </template>
 <script>
   import moment from "moment"
+  import {getSchoolPage} from '../../../api/school/index'
   export default {
     data(){
       return{
@@ -475,6 +476,13 @@
         allBPrice:0,
         allWPrice:0,
         userInfo:{},
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 99999,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       }
     },created(){
       this.userInfo = this.getLocalStorage();
@@ -916,15 +924,11 @@
         },err=>{})
       },
       getCompanyList(){ //获取公司列表
-        let userInfo=this.getLocalStorage();
-        let msg={
-          RB_Group_Id:userInfo.RB_Group_id
-        };
-        this.apipost('admin_get_BranchGetList',msg,res=>{
-          if(res.data.resultCode==1){
-            this.CompanyList=res.data.data;
-          }else{}
-        },err=>{})
+        getSchoolPage(this.schoolMsg).then(res => {
+          this.CompanyList = res.Data.PageData;
+        }).catch(() => {
+
+        })
       },
       getList(){ //获取列表
         this.checkList=[];

src/pages/financial/accDetail/CompanyAccDetail.vue

@@ -158,9 +158,9 @@
               <el-select  filterable  v-model='msg.RB_Branch_Id' >
                 <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>
@@ -437,6 +437,8 @@
 </template>
 <script>
   import moment from "moment"
+  import {getSchoolPage} from '../../../api/school/index'
+
   export default {
     data(){
       return{
@@ -519,6 +521,13 @@
         saveMsg:[],
         TradeDate:'',
         initialIndex: 0,
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 99999,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       }
     },
     created(){
@@ -1047,15 +1056,11 @@
         },err=>{})
       },
       getCompanyList(){ //获取公司列表
-        let userInfo=this.getLocalStorage();
-        let msg={
-          RB_Group_Id:userInfo.RB_Group_id
-        };
-        this.apipost('admin_get_BranchGetList',msg,res=>{
-          if(res.data.resultCode==1){
-            this.CompanyList=res.data.data;
-          }else{}
-        },err=>{})
+        getSchoolPage(this.schoolMsg).then(res => {
+          this.CompanyList = res.Data.PageData;
+        }).catch(() => {
+
+        })
       },
 
       showUpLoadFile(i){  // 预览上传文件

src/pages/financial/accDetail/PlatformAccDetail.vue

@@ -119,9 +119,9 @@
               <el-select  filterable  v-model='msg.RB_Branch_Id' >
                 <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>
@@ -360,6 +360,8 @@
 </template>
 <script>
   import moment from 'moment'
+  import {getSchoolPage} from '../../../api/school/index'
+
   export default {
     data(){
       return{
@@ -435,6 +437,13 @@
         allBPrice:0,
         allWPrice:0,
         userInfo:{},
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 99999,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       }
     },created(){
       this.userInfo = this.getLocalStorage();
@@ -936,15 +945,11 @@
         },err=>{})
       },
       getCompanyList(){ //获取公司列表
-        let userInfo=this.getLocalStorage();
-        let msg={
-          RB_Group_Id:userInfo.RB_Group_id
-        };
-        this.apipost('admin_get_BranchGetList',msg,res=>{
-          if(res.data.resultCode==1){
-            this.CompanyList=res.data.data;
-          }else{}
-        },err=>{})
+        getSchoolPage(this.schoolMsg).then(res => {
+          this.CompanyList = res.Data.PageData;
+        }).catch(() => {
+
+        })
       },
     },mounted(){
       let userInfo=this.getLocalStorage();

src/pages/financial/addFinancialProcess.vue

@@ -706,7 +706,7 @@
         isIndeterminate: true,
         schoolMsg:{
           pageIndex: 1,
-          pageSize: 12,
+          pageSize: 99999,
           rowsPerPage: 12,
           SName: "",
           Status: '-1'