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

src/pages/financial/AccountPageList.vue

+<style>
+  @import "css/cssReset.css";
+
+  .page_AccountPageList tr th,.page_AccountPageList tr td{
+    padding: 10px 20px;
+    text-align: left;
+  }
+</style>
+<template>
+  <div class="flexOne page_AccountPageList">
+    <div class='query-box'>
+      <ul>
+        <li>
+          <input type="button" class="hollowFixedBtn" value="返回" @click="goUrl()"/>
+        </li>
+      </ul>
+    </div>
+    <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th width='200px'>{{$t('fnc.bieming')}}</th>
+        <th>{{$t('fnc.zhanghuleixing')}}</th>
+        <th>{{$t('hotel.hotel_Currency')}}</th>
+        <th>{{$t('fnc.yueacc')}}</th>
+        <th>{{$t('fnc.bwbyue')}}</th>
+        <th>{{$t('admin.admin_czPerson')}}</th>
+        <th width='200px'>{{$t('fnc.caozuoriqi')}}</th>
+      </tr>
+      <tr v-for="(item,index) in dataList" :key="index">
+        <td>{{item.Alias}}</td>
+        <td>{{item.AccountTypeName}}</td>
+        <td>{{item.CurrencyName}}</td>
+        <td>¥{{item.Initialbalance}}</td>
+        <td>￥{{item.RBNInitialbalance}}</td>
+        <td>{{item.emName}}</td>
+        <td>{{item.CreateDate}}</td>
+      </tr>
+    </table>
+    <div>
+      <el-pagination
+        background
+        @current-change="handleCurrentChange"
+        :current-page.sync="currentPage"
+        layout="total,prev, pager, next, jumper"
+        :page-size=msg.pageSize
+        :total=total>
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data(){
+      return{
+        dataList:[],
+        loading:false,
+        total:0,
+        currentPage:1,
+        msg:{
+          PageIndex:1,
+          pageSize:15,
+          BackId:0,
+          TypeId:0,
+          ID:0,
+          BankType:0,
+        },
+      }
+    },created(){
+      this.msg.BackId = this.$route.query.BackId;
+      this.msg.TypeId = this.$route.query.TypeId;
+    },mounted(){
+      this.getList()
+    },methods:{
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+      resetPageIndex(){
+        this.msg.pageIndex=1;
+        this.currentPage = 1
+      },
+      getList(){
+        this.loading = true;
+        this.apipost('FinancialInstitutions_post_GetAccountList',this.msg,r=>{
+          if(r.data.resultCode==1){
+            this.total = r.data.data.count;
+            this.dataList = r.data.data.pageData;
+          }
+          this.loading = false;
+        },null)
+      },
+      goUrl(){
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>

src/pages/financial/AccountType.vue

@@ -704,12 +704,11 @@
         });
       },
       goUrl(path, id) {
+        var tempStr = '/financial/' + path  +'?TypeId='+id;
+        console.log(tempStr)
         this.$router.push({
-          name: path,
-          query: {
-            'TypeId': id
-          }
-        })
+          path: tempStr
+        });
       }
     },
     mounted() {

src/pages/financial/CashAccount.vue

@@ -209,57 +209,13 @@
               <el-input v-model="addMsg.Initialbalance" class=""></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="4" :gutter="35">
-              <el-form-item label="收款负责人：" prop="InCharge" class="_fuzeren">
-                  <el-select
-                      v-model="addMsg.InCharge"
-                      filterable
-                      remote
-                      reserve-keyword
-                      placeholder="请输入关键词"
-                      :remote-method="remoteMethod"
-                      @focus="Charge=1"
-                      :loading="loading2">
-                      <el-option
-                          v-for="item in showEmployeeList"
-                          :key="item.empId"
-                          :label="`${item.name}`"
-                          :value="item.empId">
-                          <span style="float: left; font-size: 12px">{{ item.name }}</span>
-                          <span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
-                      </el-option>
-                  </el-select>
-              </el-form-item>
-          </el-col>
-          <el-col :span="4" :gutter="35">
-              <el-form-item label="支款负责人：" prop="OutCharge" class="_fuzeren">
-                  <el-select
-                      v-model="addMsg.OutCharge"
-                      filterable
-                      remote
-                      reserve-keyword
-                      placeholder="请输入关键词"
-                      :remote-method="remoteMethod2"
-                      @focus="Charge=2"
-                      :loading="loading2">
-                      <el-option
-                          v-for="item in showEmployeeList2"
-                          :key="item.empId"
-                          :label="`${item.name}`"
-                          :value="item.empId">
-                          <span style="float: left; font-size: 12px">{{ item.name }}</span>
-                          <span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
-                      </el-option>
-                  </el-select>
-              </el-form-item>
-          </el-col> -->
           <el-col :span="4" :gutter="35" class="_BranchIdS">
             <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>
@@ -349,6 +305,9 @@
   </div>
 </template>
 <script>
+  import {
+    getSchoolPage
+  } from '../../api/school/index'
   export default {
     data(){
       return{
@@ -455,6 +414,13 @@
           CostTypeID:''
         },
         costType:[],
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 12,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       }
     },methods:{
       goUrlNew (item) {
@@ -570,15 +536,11 @@
         },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_GetCashAccount',{ID:id}, res => {

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>
@@ -315,6 +315,9 @@
 </template>
 <script>
 import Vue from 'vue'
+import {
+  getSchoolPage
+} from '../../api/school/index'
 export default {
   data() {
     return {
@@ -475,7 +478,14 @@ export default {
         Source: 2,
         CostTypeID: ""
       },
-      costType: []
+      costType: [],
+      schoolMsg:{
+        pageIndex: 1,
+        pageSize: 12,
+        rowsPerPage: 12,
+        SName: "",
+        Status: '-1'
+      }
     };
   },
   methods: {
@@ -860,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 获取信息
@@ -1190,7 +1181,7 @@ export default {
     }
   },
   mounted() {
-    this.msg.pageSize = this.calcPageSize(40);
+    // this.msg.pageSize = this.calcPageSize(40);
     // let userInfo = this.getLocalStorage();
     // this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
     // var branchId = userInfo.RB_Branch_id;
@@ -1201,6 +1192,7 @@ export default {
     //   this.getCompanyList(2,userInfo);
     //   this.msg.RB_Branch_Id = branchId;
     // }
+    this.getCompanyList();
 
     this.getList();
     this.initColums();

src/pages/financial/accountingWork.vue

@@ -147,9 +147,9 @@
               <el-form-item :label="$t('fnc.ssuogongsi')+'：'" prop="BranchId">
                 <el-select  filterable v-model='addMsg.BranchId'>
                   <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>
@@ -206,19 +206,6 @@
                 <el-radio v-model="addMsg.Direct" :label="3">{{$t('fnc.shouzhi')}}</el-radio>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-                <el-form-item label="适用费用"  class="_treeselect">
-                    <treeselect
-                        class=""
-                        v-model="CostIdS"
-                        value-consists-of="LEAF_PRIORITY"
-                        placeholder="请选择"
-                        :multiple="true"
-                        :options="CostTypeList"
-                        noChildrenText=''
-                        :normalizer="normalizer"/>
-                </el-form-item>
-            </el-col> -->
           </el-row>
         </el-form>
       </div>
@@ -228,6 +215,9 @@
 <script>
   import Treeselect from '@riophae/vue-treeselect'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+  import {
+    getSchoolPage
+  } from '../../api/school/index'
   export default {
     components: { Treeselect },
     data(){
@@ -300,6 +290,13 @@
           Status:'0',
         },
         SingleList:[],
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 12,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       }
     },created(){
       let userInfo = this.getLocalStorage();
@@ -520,12 +517,11 @@
         this.$refs[formName].resetFields();
       },
       getCompanyList(){ //获取公司列表
-        this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
-          if(res.data.resultCode==1){
-            let data = res.data.data
-            this.CompanyList=res.data.data;
-          }else{}
-        },err=>{})
+        getSchoolPage(this.schoolMsg).then(res => {
+          this.CompanyList = res.Data.PageData;
+        }).catch(() => {
+
+        })
       },
     },mounted(){
       this.getList();

src/pages/financial/financalDocument/CapitalAllocation.vue

@@ -73,9 +73,9 @@
             <el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
               <el-option :value="-1" :label="$t('pub.unlimitedSel')"></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>
@@ -218,6 +218,9 @@
   </div>
 </template>
 <script>
+  import {
+    getSchoolPage
+  } from '../../../api/school/index'
   export default {
     data(){
       return {
@@ -267,6 +270,13 @@
         total: 0,
         currentPage: 0,
         btnShow:false,
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 12,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       }
     },
     created(){
@@ -316,11 +326,11 @@
         this.msg.EmployeeId=this.EmId;
         this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
       getCompanyList: function () { //获取公司列表
-        this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
-          if(res.data.resultCode==1){
-            this.CompanyList=res.data.data;
-          }else{}
-        },err=>{})
+        getSchoolPage(this.schoolMsg).then(res => {
+          this.CompanyList = res.Data.PageData;
+        }).catch(() => {
+
+        })
       },
       getDepartment: function () {  //获取部门列表
         this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {

src/pages/financial/financalDocument/FinancialDocuments.vue

@@ -590,7 +590,7 @@
               class="iconfont icon-gengduo"></i></em>
         </span>
         <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
-        <button class="normalBtn" @click="goUrlAdd('ChoiceAddFinancialDocuments')">{{$t('pub.addBtn')}}</button>
+        <button class="normalBtn" @click="goUrlWeituo('ChoiceAddFinancialDocuments')">{{$t('pub.addBtn')}}</button>
         <button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
         <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
         <button class="hollowFixedBtn" @click="goUrlWeituo('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
@@ -681,7 +681,7 @@
                 @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment()"
                 class="w150">
                 <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
-                <el-option v-for='item in CompanyList' :label='item.BName' :value='item.Id' :key='item.Id'>
+                <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
                 </el-option>
               </el-select>
             </span>
@@ -1230,6 +1230,9 @@
   import myrbvBill from "../components/ReceivablesModule.vue";
   import myhrBill from "../components/MergeBillModule.vue";
   import myGZBill from "../components/GZBillModule.vue";
+  import {
+    getSchoolPage
+  } from '../../../api/school/index'
   export default {
     data() {
       return {
@@ -1403,10 +1406,13 @@
           IsAdvanceFinance: 1,
         },
         costList: [],
-
-
-
-
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 12,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       }
     },
     created() {
@@ -2152,11 +2158,11 @@
         }, err => {})
       },
       getCompanyList() { //获取公司列表
-        this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.CompanyList = res.data.data;
-          } else {}
-        }, err => {})
+        getSchoolPage(this.schoolMsg).then(res => {
+          this.CompanyList = res.Data.PageData;
+        }).catch(() => {
+
+        })
       },
       Financial_post_GetConditionList() { //获取财务单据枚举列表
         this.apipost('Financial_post_GetConditionList', {}, res => {
@@ -2299,15 +2305,6 @@
           path: tempStr
         });
       },
-      goUrlAdd(path) {
-        this.$router.push({
-          name: path,
-          query: {
-            blank: 'y',
-            tab: '选择财务单据类型'
-          }
-        })
-      },
       goEit(type, id, edit, Conditon, pageIndex, item) {
         let path = '';
         if (type === 1) {

src/pages/financial/financalDocument/RecPayQuery.vue

@@ -500,7 +500,7 @@
                 @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'>
+                <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -705,6 +705,9 @@
   import myrbvBill from "../components/ReceivablesModule.vue";
   import myhrBill from "../components/MergeBillModule.vue";
   import Vue from 'vue'
+  import {
+    getSchoolPage
+  } from '../../../api/school/index'
   // 自定义列组件
   Vue.component('table-BranchName', { //查看操作按钮
     template: `<span>{{rowData.BranchName}}</span>`,
@@ -1341,7 +1344,14 @@
         ],
         pageSize: 5,
         pageIndex: 1,
-        heightQueryBox: false
+        heightQueryBox: false,
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 12,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       }
     },
     created() {
@@ -1726,11 +1736,11 @@
         }, err => {})
       },
       getCompanyList() { //获取公司列表
-        this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.CompanyList = res.data.data;
-          } else {}
-        }, err => {})
+        getSchoolPage(this.schoolMsg).then(res => {
+          this.CompanyList = res.Data.PageData;
+        }).catch(() => {
+
+        })
       },
       Financial_post_GetConditionList() { //获取财务单据枚举列表
         this.apipost('Financial_post_GetConditionList', {}, res => {

src/pages/financial/financalDocument/invoicesManager.vue

@@ -130,7 +130,7 @@
             <el-form-item label="公司">
               <el-select v-model="msg.RB_Branch_Id" filterable >
                 <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
-                <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
+                <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -252,12 +252,15 @@
   </div>
 </template>
 <script>
+  import {
+    getSchoolPage
+  } from '../../../api/school/index'
   export default {
     data() {
       return {
         active: 1,
         RB_Group_Id:'',
-        companyList:[],
+        CompanyList:[],
         msg: {
           TCID: 0,
           TCNUM: '',
@@ -279,6 +282,13 @@
         loading: false,
         currentPage: 0,
         total:0,
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 12,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       };
     },
     methods: {
@@ -369,13 +379,11 @@
         this.currentPage = 1;
       },
       getBranchList(){
+        getSchoolPage(this.schoolMsg).then(res => {
+          this.CompanyList = res.Data.PageData;
+        }).catch(() => {
 
-        this.RB_Group_Id = this.getLocalStorage().RB_Group_id;
-        this.apipost('admin_get_BranchGetList', {RB_Group_Id:this.RB_Group_Id}, res=>{
-          if (res.data.resultCode == 1) {
-            this.companyList=res.data.data;
-          }
-        }, null)
+        })
       }
     },
     mounted() {

src/pages/financial/sellCommissionRules.vue

@@ -111,8 +111,8 @@
                   <el-option :label="$t('fnc.jttongyong')" value="-1"></el-option>
                   <el-option
                     v-for="(item, index) in CompanyList"
-                    :label="item.BName"
-                    :value="item.Id.toString()"
+                    :label="item.SName"
+                    :value="item.SId"
                     :key="index"
                   ></el-option>
                 </el-select>
@@ -255,6 +255,9 @@
 </template>
 <script>
   import Vue from "vue";
+  import {
+    getSchoolPage
+  } from '../../api/school/index'
   export default {
     data() {
       var checkVariable = (rule, value, callback) => {
@@ -310,7 +313,14 @@
           RB_Group_Id: 0
         },
         desctionsResources:[],
-        desctions:[]
+        desctions:[],
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 12,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       };
     },
     methods: {
@@ -625,22 +635,11 @@
       },
       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;
-              this.getline();
-            } else {
-            }
-          },
-          err => {}
-        );
+        getSchoolPage(this.schoolMsg).then(res => {
+          this.CompanyList = res.Data.PageData;
+        }).catch(() => {
+
+        })
       },
       getline() {
         let msg = { pageIndex: 0, pageSize: 100 };

src/router/routes.js

@@ -122,6 +122,11 @@ const routes = [{
         component: () =>
         import("pages/financial/AccountType.vue")
       },
+      {
+        path: "/financial/AccountPageList", //关联账户
+        component: () =>
+          import("pages/financial/AccountPageList.vue")
+      },
       {
         path: "/financial/CostType", //费用类型
         component: () =>

src/utils/erpindex.js

@@ -84,7 +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.13:8083";
+       domainUrl = "http://192.168.1.48:8015";
       //domainUrl = "http://192.168.1.21:8069";
 
       let javaUrldo = "";