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

src/assets/common/lang/zh.js

@@ -924,6 +924,11 @@ export const fnc = {
   cjleixing: '类型层级：',
   yes: '是',
   fou: '否',
+  glzhangu: '关联账户',
+  xnleixing: '虚拟类型',
+  tjzhanghu: '添加账户',
+  sfduigong: '是否对公',
+  sybumen: '适用部门：',
 
 }
 export const tips = {
@@ -1048,4 +1053,6 @@ export const rule = {
   qtxqmhuilv: '请填写期末汇率',
   qtxfymingcheng: '请填写费用名称',
   qxzlxcengji: '请选择类型层级',
+  qtxzhmingcheng: '请填写账户名称',
+  qxzsybumen: '请选择适用部门',
 }

src/components/systemManagement/AccountType.vue

@@ -105,29 +105,29 @@
                     </div>
                     <div class="cmci_cen">
                         <p class="_t _cup" @click="item.PeopleNum!=0?goUrl('AccountPageList',item.ID):''">
-                            <span>关联账户</span>
+                            <span>{{$t('fnc.glzhangu')}}</span>
                             <span class="PingFangSC _underline" v-if='item.PeopleNum!=0'>{{item.PeopleNum}}个</span>
                             <span class="PingFangSC" v-else>-</span>
                         </p>
-                        <p class="_t"><span>虚拟类型</span><span v-if="item.IsVirtual==0">否</span><span v-if="item.IsVirtual==1">是</span></p>
+                        <p class="_t"><span>{{$t('fnc.xnleixing')}}</span><span v-if="item.IsVirtual==0">{{$t('fnc.fou')}}</span><span v-if="item.IsVirtual==1">{{$t('fnc.yes')}}</span></p>
                         <p class="_btn">
-                            <span class="_e" @click="editCurency(item.ID),text='修改',addShow=true">修改</span>
-                            <span class="_d" @click="financeinfoRemove(item.ID,item.Name)">删除</span>
+                            <span class="_e" @click="editCurency(item.ID),text=$t('pub.updateMsg'),addShow=true">{{$t('pub.updateMsg')}}</span>
+                            <span class="_d" @click="financeinfoRemove(item.ID,item.Name)">{{$t('sysytem.table_delete')}}</span>
                         </p>
                     </div>
                 </div>
-                <div class="cmc_item _addbox" @click="addShow=true,text='新增'">
+                <div class="cmc_item _addbox" @click="addShow=true,text=$t('pub.addBtn')">
                     <p><i class="iconfont icon-img_haha"></i></p>
-                    <p>添加账户</p>
+                    <p>{{$t('fnc.tjzhanghu')}}</p>
                 </div>
             </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('fnc.zhanghuleixing')}}</th>
+                    <th>{{$t('fnc.glzhangu')}}</th>
+                    <th>{{$t('fnc.sfduigong')}}</th>
+                    <th>{{$t('fnc.xnleixing')}}</th>
+                    <th>{{$t('sysytem.table_operation')}}</th>
                 </tr>
                 <tr v-for="(item,index) in tableInfo" :key="index">
                     <td>{{item.Name}}</td>
@@ -142,10 +142,10 @@
                     </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),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),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('sysytem.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>
@@ -168,19 +168,19 @@
         </div>
 
         <div class="_vMG_edit" :class="addShow==true?'edHeight':''">
-            <p class="_tit">{{text}}账户类型</p>
+            <p class="_tit">{{text}}{{$t('fnc.zhanghuleixing')}}</p>
             <el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
                 <ul class="clearfix">
                     <li>
-                        <el-form-item label="名称：" prop="Name">
+                        <el-form-item :label="$t('fnc.Name')" prop="Name">
                             <el-input v-model="addMsg.Name" class="w135"></el-input>
                         </el-form-item>
                     </li>
                     <li>
-                      <el-form-item label="适用部门：">
+                      <el-form-item :label="$t('fnc.sybumen')">
                         <!--<el-select filterable   v-model='addMsg.DepartmentID' @change="getPostList()">-->
                         <el-select filterable multiple v-model='RangeIdsList' @change="changeRange">
-                          <el-option label='通用' :value='-1'></el-option>
+                          <el-option :label='$t('active.cl_tongyong')' :value='-1'></el-option>
                           <el-option v-for='item in departmentList'
                                      :label='item.DepartmentName'
                                      :value='item.DepartmentID'
@@ -191,12 +191,12 @@
                       </el-form-item>
                     </li>
                     <li>
-                        <el-form-item label="是否对公："  class='w150' prop="IsPublic" >
+                        <el-form-item :label="$t('fnc.sfduigong')+'：'"  class='w150' prop="IsPublic" >
                             <el-switch v-model="addMsg.IsPublic" active-value="1" inactive-value="0"></el-switch>
                         </el-form-item>
                     </li>
                     <li>
-                        <el-form-item label="虚拟类型："  class='w150' prop="IsVirtual" >
+                        <el-form-item :label="$t('fnc.xnleixing')+'：'"  class='w150' prop="IsVirtual" >
                             <el-switch v-model="addMsg.IsVirtual" active-value="1" inactive-value="0"></el-switch>
                         </el-form-item>
                     </li>
@@ -256,10 +256,10 @@
 				},
                 rules: {//表单必填验证
                     Name: [
-                        { required: true, message: '请填写账户名称', trigger: 'blur' }
+                        { required: true, message: this.$t('fnc.qtxzhmingcheng'), trigger: 'blur' }
                     ],
                     DepartIDsArr: [
-                        { required: true, message: '请选择适用部门', trigger: 'change' }
+                        { required: true, message: this.$t('fnc.qxzsybumen'), trigger: 'change' }
                     ]
                 },
                 transitionShow:false,
@@ -355,9 +355,9 @@
                 }
             },
             financeinfoRemove(id,text){  // 删除
-                this.$confirm('确定删除'+text+'费用类型？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                this.$confirm(this.$t('tips.qrsc')+text+this.$t('tips.feiyongleixing'), this.$t('tips.tips'), {
+                    confirmButtonText: this.$t('pub.sureBtn'),
+          cancelButtonText: this.$t('pub.cancelBtn'),
                     type: 'warning'
                 }).then(() => {
                    this.apipost('AccountType_post_Remove',{ID:id}, res => {
@@ -371,7 +371,7 @@
                 }).catch(() => {
                     this.$message({
                         type: 'info',
-                        message: '已取消'
+                        message: this.$t('hotel.hotel_HasBeenCancelled')
                     });
                 });
             },
@@ -472,20 +472,20 @@
             },
             isdelete(ID){
                 this.deleteID = ID;
-                this.$confirm('是否删除?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+                this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips') ,{
+                confirmButtonText: this.$t('pub.sureBtn'),
+                cancelButtonText: this.$t('pub.cancelBtn'),
                 type: 'warning'
                 }).then(() => {
                     this.$message({
                         type: 'success',
-                        message: '删除成功!'
+                        message: this.$t('tips.shanchuchenggong')
                     });
                     this.delInfo();
                 }).catch(() => {
                     this.$message({
                         type: 'info',
-                        message: '已取消删除'
+                        message: this.$t('hotel.hotel_HasBeenCancelled')
                     });
                 });
             },
@@ -495,11 +495,11 @@
                 }
                 this.apipost('currency_post_Remove', msg, res => {
                 if(res.data.resultCode == 1) {
-                    this.tips('删除成功','success');
+                    this.tips(this.$t('tips.shanchuchenggong'),'success');
                     this.innerVisible = false;
                     this.initTableInfo();
                 } else {
-                    this.tips('删除失败','success');
+                    this.tips(this.$t('tips.shanchushibai'),'success');  
                 }
             }, err => {})
             },