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

src/pages/financial/PlatformAccount.vue

@@ -481,7 +481,7 @@ export default {
       costType: [],
       schoolMsg:{
         pageIndex: 1,
-        pageSize: 12,
+        pageSize: 9999,
         rowsPerPage: 12,
         SName: "",
         Status: '-1'
@@ -539,8 +539,8 @@ export default {
       // let companyList = [];
       this.CompanyList.forEach(x => {
         let item = {};
-        item.label = x.BName;
-        item.value = x.Id;
+        item.label = x.SName;
+        item.value = x.SId;
         this.CompanySelect.push(item);
       });
       let allName = {

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'

src/pages/financial/financalDocument/addCapitalAllocation.vue

@@ -158,7 +158,8 @@
   <div class="page_addCapitalAllocation" v-loading="loading">
     <div class="_top">
       <p>{{BillName}}</p>
-      <p><span>{{msg.TemplateId==34?$t('fnc.zongbu'):$t('fnc.fgongsi')}}{{$t('fnc.zjdbodan')}}</span></p>
+<!--      <p><span>{{msg.TemplateId==34?$t('fnc.zongbu'):$t('fnc.fgongsi')}}{{$t('fnc.zjdbodan')}}</span></p>-->
+      <p><span>{{$t('fnc.zjdbodan')}}</span></p>
     </div>
     <div class="_conten">
       <ul v-if="inList.length">
@@ -415,8 +416,8 @@
       } else {
         this.initMsg()
         let userInfo = this.getLocalStorage();
-        this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
-        this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
+        this.msg.RB_Depart_Id = userInfo.DeptId;
+        this.msg.RB_Branch_Id = userInfo.School_Id;
         if(this.$route.query.fengs){
           this.msg.RB_Branch_Id = 1218;
         }

src/utils/erpindex.js

@@ -73,7 +73,7 @@ export default{
     Vue.prototype.getLocalStorage = function () {
       var localStorageData = window.localStorage["loginUserInfo"];
       if (localStorageData !== undefined && localStorageData != 'undefined') {
-        return JSON.parse(localStorageData);
+        return JSON.parse(localStorageData).data;
       } else {
         return null;
       }
@@ -84,8 +84,8 @@ export default{
       let mallUrl = ""; //商城API
       let locationName = window.location.hostname;
       // domainUrl = "http://127.0.0.1";
-      //  domainUrl = "http://192.168.1.13:8083";
-       domainUrl = "http://192.168.1.48:8015";
+       domainUrl = "http://192.168.1.13:8083";
+      //  domainUrl = "http://192.168.1.48:8015";
       //domainUrl = "http://192.168.1.21:8069";
 
       let javaUrldo = "";