1

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_1d3rshddcgk.css');
+@import url('//at.alicdn.com/t/font_2077629_il9ypki1in.css');
 
 html,
 body,

src/pages/financial/accDetail/CashAccDetail.vue

@@ -121,7 +121,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" :gutter="35">
-            <el-form-item label="所属公司">
+            <el-form-item label="所属校区">
               <el-select  filterable  v-model='msg.RB_Branch_Id' >
                 <el-option :value="-1" label="不限"></el-option>
                 <el-option v-for='item in CompanyList'
@@ -923,7 +923,7 @@
           }
         },err=>{})
       },
-      getCompanyList(){ //获取公司列表
+      getCompanyList(){ //获取校区列表
         getSchoolPage(this.schoolMsg).then(res => {
           this.CompanyList = res.Data.PageData;
         }).catch(() => {

src/pages/financial/accDetail/CashReport.vue

@@ -70,7 +70,7 @@
           <th colspan="14">四川和平国际旅行社有限公司资金日报表</th>
         </tr>
         <tr>
-          <th>公司</th>
+          <th>校区</th>
           <th>银行</th>
           <th colspan="2">上期余额</th>
           <th colspan="2">本期借方发生额</th>

src/pages/financial/accDetail/CompanyAccDetail.vue

@@ -154,7 +154,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" :gutter="35">
-            <el-form-item label="所属公司">
+            <el-form-item label="所属校区">
               <el-select  filterable  v-model='msg.RB_Branch_Id' >
                 <el-option :value="-1" label="不限"></el-option>
                 <el-option v-for='item in CompanyList'
@@ -1055,7 +1055,7 @@
           }
         },err=>{})
       },
-      getCompanyList(){ //获取公司列表
+      getCompanyList(){ //获取校区列表
         getSchoolPage(this.schoolMsg).then(res => {
           this.CompanyList = res.Data.PageData;
         }).catch(() => {

src/pages/financial/accDetail/PlatformAccDetail.vue

@@ -115,7 +115,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" :gutter="35">
-            <el-form-item label="所属公司">
+            <el-form-item label="所属校区">
               <el-select  filterable  v-model='msg.RB_Branch_Id' >
                 <el-option :value="-1" label="不限"></el-option>
                 <el-option v-for='item in CompanyList'
@@ -944,7 +944,7 @@
           }
         },err=>{})
       },
-      getCompanyList(){ //获取公司列表
+      getCompanyList(){ //获取校区列表
         getSchoolPage(this.schoolMsg).then(res => {
           this.CompanyList = res.Data.PageData;
         }).catch(() => {

src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue

@@ -315,6 +315,7 @@
 
       this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
       this.orderObj = this.$route.query.orderObj;
+      console.log(this.orderObj ,'this.orderObj ')
       this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
       this.czmsg = this.$route.query.czmsg?this.$route.query.czmsg:this.czmsg;
 

src/pages/financial/financalDocument/FinancialDocuments.vue

@@ -597,10 +597,10 @@
         <button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">合并审批</button>
         <button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button>
         <button v-loading="hbBtn" v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>
-        <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>
-        <button class="hollowFixedBtn" @click="ZhiDanChongDi"> 预付款冲抵</button>
+<!--        <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>-->
+<!--        <button class="hollowFixedBtn" @click="ZhiDanChongDi"> 预付款冲抵</button>-->
         <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"
-          v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
+          v-if="msg.Conditon === 3 ">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
         <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn"
           @click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
         <button class="hollowFixedBtn" @click="BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1), BOSSBtn = false"
@@ -1026,7 +1026,7 @@
               <i v-if="((msg.Conditon==1 ||msg.Conditon==7)  && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))"
                 class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
             </el-tooltip>
-            <el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1" class="item"
+            <el-tooltip  class="item"
               :content="$t('fnc.tzjyriqi')" placement="top">
               <i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng"
                 @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate"></i>
@@ -1457,14 +1457,13 @@
       this.GetAuth();
       this.getCostTypeList();
       let userInfo = this.getLocalStorage();
-      this.yfOutBranchId = userInfo.RB_Branch_id;
-      let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
-      this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
-      this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo
-        .RB_Group_id; //集团ID
+      this.yfOutBranchId = userInfo.School_Id;
+      // let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
+      // this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
+      this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.GroupName; //集团ID
       this.ActionMenuCode = userInfo.ActionMenuCode;
-      this.DepartIDs = userInfo.RB_Department_Id;
-      this.userId = userInfo.EmployeeId;
+      this.DepartIDs = userInfo.DeptId;
+      this.userId = userInfo.Id;
       this.getMyRejectFinanceCount();
       this.financeinfo_post_GetList();
       this.financeinfo_post_GetCostTypeList();

src/pages/financial/financalDocument/RecPayQuery.vue

@@ -1232,7 +1232,7 @@
         tableData: [],
         columns: [{
             field: 'BranchName',
-            title: '所属公司',
+            title: '所属校区',
             width: 80,
             titleAlign: 'left',
             columnAlign: 'left',

src/pages/financial/financalDocument/invoicesManager.vue

@@ -127,7 +127,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" :gutter="35">
-            <el-form-item label="公司">
+            <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.SName' :value='item.SId' :key='item.SId'></el-option>

src/pages/financial/lang/zh.js

@@ -74,7 +74,7 @@ export const system = {
     label_jingting:'经停',
     label_info:'描述',
     label_img:'图片',
-    query_company:'所属公司',
+    query_company:'所属校区',
     query_lineName:'线路名称',
     query_name:'姓名',
     query_dest:'目的地',