冲突.

src/components/FinancialModule/CapitalAllocation.vue

@@ -60,13 +60,13 @@
     <el-form label-width="100px" class="form">
       <el-row :gutter="20">
         <el-col :span="4">
-          <el-form-item label="单据编号">
+          <el-form-item :label="$t('fnc.djbianhao')">
             <el-input v-model="msg.FrID"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="公司">
-            <el-select v-model="msg.RB_Branch_Id" placeholder="请选择公司" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
+          <el-form-item :label="$t('system.table_company')">
+            <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'
@@ -77,8 +77,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="部门">
-            <el-select v-model="msg.RB_Depart_Id" placeholder="请选择部门" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
+          <el-form-item :label="$t('admin.admin_Department')">
+            <el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
               <el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for='item in DepartmentList'
                 :label='item.DepartmentName'
@@ -89,7 +89,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="制单人">
+          <el-form-item :label="$t('fnc.zhidanren')">
             <el-select  filterable  v-model='msg.UpdateBy'>
               <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for='item in EmployeeList'
@@ -101,13 +101,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="制单日期">
+          <el-form-item :label="$t('fnc.zdriqi')">
             <el-date-picker
               @change="timeAdd(1)"
               v-model="productionDate"
               type="daterange"
               value-format="yyyy-MM-dd"
-              range-separator="至">
+              :range-separator="$t('restaurant.res_To')">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -126,13 +126,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="交易日期">
+          <el-form-item :label="$t('fnc.jiaoyiriqi')">
             <el-date-picker
               @change="timeAdd(2)"
               v-model="productionDate2"
               type="daterange"
               value-format="yyyy-MM-dd"
-              range-separator="至">
+              :range-separator="$t('restaurant.res_To')">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -141,13 +141,13 @@
     <div class="page_CapitalAllocation_list">
       <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
         <tr>
-          <th>单号</th>
-          <th>金额</th>
+          <th>{{$t('fnc.danhao')}}</th>
+          <th>{{$t('fnc.jine')}}</th>
           <!-- <th>实付</th> -->
           <!-- <th>原币金额</th> -->
           <!-- <th>交易日期</th> -->
-          <th>创建时间</th>
-          <th>创建人</th>
+          <th>{{$t('fnc.cjshijian')}}</th>
+          <th>{{$t('active.cl_addPp')}}</th>
           <!-- <th>备注</th> -->
           <th>{{$t('admin.admin_status')}}</th>
           <th>{{$t('system.table_operation')}}</th>
@@ -173,7 +173,7 @@
               trigger="click">
                 <div class="InfoChangeLog" >
                   <div class="changLog">
-                    <p class="_log_t">流程日志</p>
+                    <p class="_log_t">{{$t('fnc.lcrizhi')}}</p>
                     <ul class="changLogList" v-if="GetFinancLogList" v-loading='LogLoading'>
                       <li class="changLogList_l" v-for="(log,li) in GetFinancLogList">
                           <span style="background-color: #47BF8C"  class="_radius_green"></span>
@@ -182,7 +182,7 @@
                       </li>
                     </ul>
                     <ul v-else>
-                      <li>暂无修改日志</li>
+                      <li>{{$t('hotel.hotel_zanwu')}}</li>
                     </ul>
                   </div>
                 </div>
@@ -190,16 +190,16 @@
             </el-popover>
           </td>
           <td>
-            <el-tooltip class="item" effect="dark" content="修改"  placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
+            <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
               <i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="详情"  placement="top">
+            <el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')"  placement="top">
               <i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID)"></i>
             </el-tooltip>
           </td>
         </tr>
       </table>
-      <div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
+      <div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>{{$t('active.ld_noData')}}</p></div>
       <div>
             <el-pagination
                 background
@@ -259,7 +259,9 @@ export default {
       GetFinancLogList: [],
       loading: true,
       LogLoading: true,
-      EmId:0
+      EmId:0,
+      total: 0,
+      currentPage: 0,
     }
   },
   created(){
@@ -304,7 +306,7 @@ export default {
             if(!this.msg.Status)this.msg.Status=0;
             if(!this.msg.FrID)this.msg.FrID=0;
             this.msg.EmployeeId=this.EmId;
-            this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,"资金调拨报表.xls");} ,        
+            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){

src/components/busManagement/busStatistics.vue

@@ -165,6 +165,9 @@
 							<div v-show="item.DMCRemark!=''" class="colorE95252">地接备注:{{item.DMCRemark}}</div>
 							<div v-show="item.OPRemark!=''" class="colorE95252"> OP备注（对外）:{{item.OPRemark}}</div>
 							<div v-show="item.OPInnerRemark!=''" class="colorE95252">OP备注（对内）:{{item.OPInnerRemark}}</div>
+
+
+							
 						</div>
 					</td>
 				</tr>