XIUGAI

src/pages/financial/CompanyAccount.vue

@@ -102,9 +102,9 @@
                                 <el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
                                 <!-- <el-option label='通用' value='-1'></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>                        
@@ -277,9 +277,9 @@
                         <el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
                             <el-select  filterable  v-model='addMsg.BranchIdS'>
                                 <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'
                                     :disabled="item.disabled">
                                 </el-option>
                             </el-select>
@@ -369,6 +369,9 @@
     </div>
 </template>
 <script>
+import {
+    getSchoolPage
+} from '../../api/school/index'
 export default {
     data(){
         return{
@@ -483,6 +486,13 @@ export default {
                 CostTypeID:''
             },
             costType:[],
+            schoolMsg:{
+                pageIndex: 1,
+                pageSize: 12,
+                rowsPerPage: 12,
+                SName: "",
+                Status: '-1'
+            }
         }
     },methods:{
         regNum(n,t){  // 判断数字    n 值 t 类型
@@ -598,15 +608,11 @@ export default {
             },err=>{})
         },	
         getCompanyList(){ //获取公司列表
-            this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
-                if(res.data.resultCode==1){
-                    let data = res.data.data;
-                    data.forEach(x=>{
-                        x.disabled = false;
-                    })
-                    this.CompanyList = data;
-                }else{}
-            },err=>{})
+            getSchoolPage(this.schoolMsg).then(res => {
+                this.CompanyList = res.Data.PageData;
+            }).catch(() => {
+
+            })
         },	
         editCurency(id){  //  修改根据ID 获取信息
             this.apipost('bankaccount_post_Get',{ID:id}, res => {

src/pages/financial/PlatformAccount.vue

@@ -170,9 +170,9 @@
               <el-select filterable v-model="addMsg.BranchIdS" collapse-tags>
                 <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"
                   :disabled="item.disabled"
                 ></el-option>
               </el-select>
@@ -314,8 +314,10 @@
   </div>
 </template>
 <script>
-// import Vue from 'vue'
-import Vue from 'vue/dist/vue.esm.js'
+import Vue from 'vue'
+import {
+  getSchoolPage
+} from '../../api/school/index'
 export default {
   data() {
     return {
@@ -476,7 +478,14 @@ export default {
         Source: 2,
         CostTypeID: ""
       },
-      costType: []
+      costType: [],
+      schoolMsg:{
+        pageIndex: 1,
+        pageSize: 12,
+        rowsPerPage: 12,
+        SName: "",
+        Status: '-1'
+      }
     };
   },
   methods: {
@@ -861,31 +870,12 @@ export default {
         err => {}
       );
     },
-    getCompanyList(t, info) {
-      if(t){
-        this.CompanyList.push({
-          BName: info.BranchName,
-          Id: info.RB_Branch_id
-        })
-        return
-      }
-      //获取公司列表
-      this.apipost(
-        "admin_get_BranchGetList",
-        this.getCompanyMsg,
-        res => {
-          if (res.data.resultCode == 1) {
-            let data = res.data.data;
-            data.forEach(x => {
-              x.disabled = false;
-            });
-            this.CompanyList = data;
-            this.initColums();
-          } else {
-          }
-        },
-        err => {}
-      );
+    getCompanyList() {
+      getSchoolPage(this.schoolMsg).then(res => {
+        this.CompanyList = res.Data.PageData;
+      }).catch(() => {
+
+      })
     },
     editCurency(id) {
       //  修改根据ID 获取信息
@@ -1202,6 +1192,7 @@ export default {
     //   this.getCompanyList(2,userInfo);
     //   this.msg.RB_Branch_Id = branchId;
     // }
+    this.getCompanyList();
 
     this.getList();
     this.initColums();