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

src/assets/common/lang/zh.js

@@ -796,6 +796,10 @@ export const fnc = {
   syfeiyong: '适用费用',
   gfyleixing: '个费用类型',
   sygongsi: '适用公司',
+  sybumen: '适用部门',
+  sygangwei: '适用岗位',
+  syrenyuan: '适用人员',
+  feiyongfangxiang: '费用方向',
   jttongyong: '集团通用',
   sydxianlu: '所有线路',
   shiyongxianlu: '适用线路',
@@ -875,6 +879,52 @@ export const fnc = {
   dwala: '必选完成周期内所有的提成要求',
   awala: '不强制完成周期内所有的提成要求',
   meiyousunyi: '该账户当前还没有损益记录',
+  qhpaiban: '切换排版',
+  jigou: '机构',
+  qsrneirong: '请输入内容',
+  zhanghuleixing: '账户类型',
+  yueacc: '余额',
+  bwbyue: '本位币余额',
+  caozuoriqi: '操作日期',
+  benqihuilv: '本期汇率',
+  danqgianhuilv: '当前汇率',
+  zjinyue: '资金余额',
+  zjjiner: '资金金额',
+  benwei: '本位',
+  sfbenweibi: '是否本位币',
+  chushihuilv: '初始汇率',
+  szbweibi: '设置本位币',
+  xzengbizhong: '新增币种',
+  b_hbmingcheng: '货币名称：',
+  b_hbdaima: '货币代码：',
+  b_cshuilv: '初始汇率：',
+  b_qchuilv: '期初汇率：',
+  ybljjine: '原币累计金额：',
+  bwbljjine: '本位累计金额：',
+  yuanbiyue: '原币余额',
+  benbiyue: '本币余额',
+  chakanmingxi: '查看明细',
+  fylxmingcheng: '费用类型名称',
+  cjleixing: '类型层级',
+  yiji: '一级',
+  erji: '二级',
+  sanji: '三级',
+  shangjileixing: '上级类型',
+  tanzhang: '摊账',
+  feitanzhang: '非摊账',
+  ysbaobiao: '营收报表',
+  bujinru: '不进入',
+  jinru: '进入',
+  yijimingcheng: '一级名称',
+  erjimingcheng: '二级名称',
+  sanjimingcheng: '三级名称',
+  shouzhi: '收支',
+  feiyongleixing: '费用类型',
+  Name: '名称：',
+  cjleixing: '类型层级：',
+  yes: '是',
+  fou: '否',
+
 }
 export const tips = {
   tips: '提示',
@@ -907,12 +957,23 @@ export const tips = {
   xzqyshijian: '选择启用时间',
   cicaozuoyongjiushanchu: '此操作将永久删除该提成规则, 是否继续?',
   shanchutishi: '删除提示',
+  shanchushibai: '删除失败',
   shanchuchenggong: '删除成功',
   baocunchenggong: '保存成功',
   wjdxbncgsz: '文件大小不能超过10M！',
   qsctpian: '请上传图片！',
   shangchuanzhong: '上传中...',
   scchenggong: '上传成功',
+  znsJPGPNGgs: '"只能是 jpg png格式!',
+  huobi: '货币？',
+  qrszwbwbb: '确认设置本位币为',
+  shifoushanchu: '是否删除?',
+  yuemingxi: '余额明细',
+  tuodongwenjian: '将文件拖到此处，或',
+  dianjishanhcuan: '点击上传',
+  znengExcel: '只能上传Excel文件，重复的费用类型不会添加哦',
+  shangchuanExcel: '上传文件只能是 excel 格式!',
+  feiyongleixing: '费用类型？',
 }
 export const Operation = {
   Op_ShortName:'线路简称',
@@ -978,4 +1039,13 @@ export const rule = {
   qsrjxshuliang: '请输入奖项数量',
   qxzjxzhuangtai: '请选择奖项状态',
   qsrpaixu: '请输入排序',
+  qsrjgmingcheng: '请输入机构名称',
+  sxzjgleixing: '请选择机构类型',
+  qtxhbmingcheng: '请填写货币名称',
+  qtxhbdaima: '请填写货币代码',
+  qsrhuilv: '请输入汇率',
+  qxzqishu: '请选择期数',
+  qtxqmhuilv: '请填写期末汇率',
+  qtxfymingcheng: '请填写费用名称',
+  qxzlxcengji: '请选择类型层级',
 }

src/components/systemManagement/AccountPageList.vue

@@ -15,13 +15,13 @@
         </div>
         <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
             <tr>
-                <th width='200px'>别名</th>
-                <th>账户类型</th>
-                <th>币种</th>
-                <th>余额</th>
-                <th>本位币余额</th>
-                <th>操作人</th>
-                <th width='200px'>操作日期</th>
+                <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>

src/components/systemManagement/AccountType.vue

@@ -83,8 +83,8 @@
         <div class="query-box">
             <ul>
                 <li>
-                    <button v-if="transitionShow2" class="normalBtn" @click="addShow=true,text='新增'" >新增</button>
-                    <el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
+                    <button v-if="transitionShow2" class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')" >{{$t('pub.addBtn')}}</button>
+                    <el-tooltip class="item" effect="dark" :content="$t('pub.qhpaiban')" placement="top-end">
                         <i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
                         <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
                     </el-tooltip>

src/components/systemManagement/FineBalance.vue

@@ -31,16 +31,16 @@
 <template>
     <div class="page_RemittanceRecord">
         <div class="_return_btn flearfix">
-            <span>{{name}}余额明细</span>
-            <button class="hollowFixedBtn fr" type="button" @click="goUrl('currencyManagement')">返回</button> 
+            <span>{{name}}{{$t('tips.yuemingxi')}}</span>
+            <button class="hollowFixedBtn fr" type="button" @click="goUrl('currencyManagement')">{{$t('pub.returnBack')}}</button> 
         </div>
         <div class="_rr_content" v-if="dataList.length>0">
-            <p>原币累计金额：<span :class="num>0?'fc_green':'fc_red'">{{nums}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>本位累计金额：<span :class="Bnum>0?'fc_green':'fc_red'">{{Bnums}}</span></span></p>
+            <p>{{$t('fnc.ybljjine')}}<span :class="num>0?'fc_green':'fc_red'">{{nums}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>{{$t('fnc.bwbljjine')}}<span :class="Bnum>0?'fc_green':'fc_red'">{{Bnums}}</span></span></p>
             <ul class="_rrc_list" v-if="">
                 <li v-for="(item,index) in dataList">
                     <div class="_rrcl_left clearfix">
                         <el-tooltip class="item" effect="dark" :content="!item.backNo?item.Alias:item.backNo" placement="top-start">
-                            <div class="_date fl">{{!item.backNo?item.Alias:item.backNo}}</div>        
+                            <div class="_date fl">{{!item.backNo?item.Alias:item.backNo}}</div>
                         </el-tooltip>
                     </div>
                     <div class="_rrcl_cen">
@@ -52,12 +52,12 @@
                             <el-tooltip class="item" effect="dark" :content="item.TypeName" placement="top-start">
                                 <span >{{item.TypeName}}</span>
                             </el-tooltip></span>
-                        <span class="_d_bl over_ellipsis pad_l80"><span class="_d_bl_name">原币余额</span>
+                        <span class="_d_bl over_ellipsis pad_l80"><span class="_d_bl_name">{{$t('fnc.yuanbiyue')}}</span>
                             <el-tooltip class="item" effect="dark" :content="item.Initialbalance" placement="top-start">
                                 <span class="font-16" :class="num>0?'fc_green':'fc_red'">{{item.Initialbalance}}</span>
                             </el-tooltip>
                         </span>
-                        <span class="_d_bl over_ellipsis"><span class="_d_bl_name">本币余额</span>
+                        <span class="_d_bl over_ellipsis"><span class="_d_bl_name">{{$t('fnc.benbiyue')}}</span>
                             <el-tooltip class="item" effect="dark" :content="item.Balance" placement="top-start">
                                 <span class="font-16" :class="num>0?'fc_green':'fc_red'">{{item.Balance}}</span>
                             </el-tooltip>
@@ -65,7 +65,7 @@
                     </div>
                     <div class="_rrcl_right">
                         <div>
-                            <button style="height: 24px;" class="hollowFixedBtn fr" type="button" @click="goUrl('currencyManagement')">查看明细</button> 
+                            <button style="height: 24px;" class="hollowFixedBtn fr" type="button" @click="goUrl('currencyManagement')">{{$t('fnc.chakanmingxi')}}</button> 
                         </div>
                     </div>
                 </li>

src/components/systemManagement/institutionsManagement.vue

@@ -121,7 +121,7 @@
                     <el-col :span="4" :gutter="35">
                         <el-form-item :label="$t('system.table_jgType')">
                             <el-select  filterable  v-model='msg.Type' >
-                                <el-option label='不限' value='-1'></el-option>
+                                <el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
                                 <el-option v-for='item in departmentList' 
                                     :label='item.Name'
                                     :value='item.Id'
@@ -135,8 +135,8 @@
 			<ul>
 				<li>
                     <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
-                    <input type="button" class="normalBtn" :value="$t('pub.addBtn')"  @click="addShow=true,text='新增',cancelEdit(),imageUrl=''"/>
-                    <el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
+                    <input type="button" class="normalBtn" :value="$t('pub.addBtn')"  @click="addShow=true,text=$t('pub.addBtn'),cancelEdit(),imageUrl=''"/>
+                    <el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
                         <i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
                         <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
                     </el-tooltip>
@@ -162,7 +162,7 @@
                             <span class="PingFangSC" v-else>-</span>
                         </p>
                         <p class="_btn">
-                            <span class="_e" @click="editCurency(item.ID,item.LogoStr),text='修改',addShow=true">{{$t('pub.updateMsg')}}</span>
+                            <span class="_e" @click="editCurency(item.ID,item.LogoStr),text=$t('pub.updateMsg'),addShow=true">{{$t('pub.updateMsg')}}</span>
                             <span class="_d" @click="financeinfoRemove(item.ID,item.Name)">{{$t('system.table_delete')}}</span>
                         </p>
                     </div>
@@ -170,11 +170,11 @@
             </div>
             <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-if="transitionShow2" v-loading="loading">
                 <tr>
-                    <th>机构名称</th>
-                    <th>机构代码</th>
-                    <th>机构类型</th>
-                    <th>下属账号</th>
-                    <th>操作</th>
+                    <th>{{$t('system.table_jgName')}}</th>
+                    <th>{{$t('system.table_jgCode')}}</th>
+                    <th>{{$t('system.table_jgType')}}</th>
+                    <th>{{$t('insManage.im_acc')}}</th>
+                    <th>{{$t('system.table_operation')}}</th>
                 </tr>
                 <tr v-for="(item,index) in DataList" :key="index">
                     <td>{{item.Name}}</td>
@@ -183,10 +183,10 @@
                     <td><span class="PingFangSC _PeopleNum" @click="item.PeopleNum!=0?goUrl('AccountPageList',item.ID):''">{{item.PeopleNum}}</span></td>
                     <td>
                         <el-row>
-                            <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
-                                <el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID,item.LogoStr),text='修改',addShow=true"></el-button>
+                            <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
+                                <el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID,item.LogoStr),text=$t('pub.updateMsg'),addShow=true"></el-button>
                             </el-tooltip>
-                            <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                            <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
                                 <el-button type="danger" class="iconfont icon-img_delete_small" circle @click="financeinfoRemove(item.ID,item.Name)"></el-button>
                             </el-tooltip>
                         </el-row>
@@ -208,7 +208,7 @@
             </div>
         </div>
         <div class="_vMG_edit" :class="addShow==true?'edHeight':''">
-            <p class="_tit">{{text}}机构</p>
+            <p class="_tit">{{text}}{{$t('fnc.jigou')}}</p>
             <el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
                 <el-row>
                     <el-col :span="4" :gutter="35">
@@ -243,8 +243,8 @@
                                 <img v-if="imageUrl" :src="imageUrl" style="height:34px" class="avatar">                                    
                                 <p class="_up_text">
                                     <i class="el-icon-plus"></i>
-                                    <span v-if="imageUrl" class="repUp">重新上传</span>
-                                    <span v-else class="repUp">上传图片</span>
+                                    <span v-if="imageUrl" class="repUp">{{$t('system.up_againUp')}}</span>
+                                    <span v-else class="repUp">{{$t('system.up_upImg')}}</span>
                                 </p>
                             </el-upload>
                         </el-form-item>  
@@ -269,7 +269,7 @@
                    <el-input type="text" v-model="addMsg.Code" :placeholder="$t('system.ph_jgCode')" class="w210"></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('system.table_Url')" class='url'>
-                    <el-input placeholder="请输入内容" v-model="addMsg.Url" :placeholder="$t('system.ph_url')" class="w210">
+                    <el-input v-model="addMsg.Url" :placeholder="$t('system.ph_url')" class="w210">
                         <template slot="prepend">Http://</template>
                     </el-input>
                 </el-form-item>
@@ -318,14 +318,14 @@ export default {
             imageUrl:'',
             rules: {//表单必填验证
                 Name: [
-                    { required: true, message: '请输入机构名称', trigger: 'blur' }
+                    { required: true, message: this.$t('rule.qsrjgmingcheng'), trigger: 'blur' }
                 ],
                 // EnCode: [
                 //     { required: true, message: '请输入机构代码', trigger: 'blur' },
                 //      { pattern: this.$commonUtils.Regex.el_IsEnglish, message: '请输入正确的机构代码' }
                 // ],
                 Type: [
-                    { required: true, message: '请选择机构类型', trigger: 'change' }
+                    { required: true, message: this.$t('rule.sxzjgleixing'), trigger: 'change' }
                 ],
             },
             transitionShow:false,
@@ -408,27 +408,27 @@ export default {
         addInstitutions(){ // 保存 修改、新增
             this.apipost('FinancialInstitutions_post_Set',this.addMsg,res=>{
                  if(res.data.resultCode == 1) {
-                    this.tips('保存成功！','success')
+                    this.tips(this.$t('tips.saveYes'),'success')
                     this.getList();
                     this.initAddMsg();
                     this.imageUrl = '';
                     this.addShow = false
                 } else {
                     this.$message.error(res.data.message)
-                }            
+                }
             },err=>{})
         },
          financeinfoRemove(id,text){//删除
-		    this.$confirm('是否删除'+text+'?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+		    this.$confirm(this.$t('tips.qrsc')+text+'?', this.$t('tips.tips'), {
+               confirmButtonText: this.$t('pub.sureBtn'),
+          cancelButtonText: this.$t('pub.cancelBtn'),
                 type: 'warning'
-            }).then(() => {              
-                this.deletInstitutions(id)   
+            }).then(() => {
+                this.deletInstitutions(id)
             }).catch(() => {
                 this.$message({
                     type: 'info',
-                    message: '已取消删除'
+                    message: this.$t('hotel.hotel_HasBeenCancelled')
                 });
             });
         },
@@ -436,7 +436,7 @@ export default {
             this.apipost('FinancialInstitutions_post_Remove',{ID:id},res=>{
                 if(res.data.resultCode == 1) {
                     this.innerVisible=false;
-                    this.tips('删除成功','success')             
+                    this.tips(this.$t('tips.shanchuchenggong'),'success')             
                 }else {
                     this.tips(res.data.message,'error');  
                       }
@@ -487,7 +487,6 @@ export default {
          this.imageUrl='';
         },
         handleAvatarSuccess(res, file) { //上传
-            console.log('上传文件', res)
             if(res.resultCode==1){
                 var img_path = res.data.FullFilePath
                 this.addMsg.Logo=res.data.FilePath
@@ -499,10 +498,10 @@ export default {
             const extension2 = file.name.split(".")[1] === "png";
             const isLt2M = file.size / 1024 / 1024 < 10;
             if (!extension && !extension2) {
-                console.log("只能是 jpg png格式!");
+                this.$message.error(thi.$t('tips.znsJPGPNGgs'))
             }
             if (!isLt2M) {
-                console.log("大小不能超过 10MB!");
+                this.$message.error(thi.$t('tips.wjdxbncgsz'))
             }
             return extension || (extension2 && isLt2M);
         },