多语言bug修改

src/assets/common/lang/zh.js

@@ -733,6 +733,9 @@ export const active = {
   cl_dkjezk: '抵扣金额/折扣',
   cl_mdskeyong: '满多少可用',
   cl_yxjzhiri: '有效截止日',
+  cl_sytiaojian: '使用条件',
+  cl_huoqufangshi: '获取方式',
+  cl_hqriqi: '获取日期',
   cl_zuofei: '作废',
   cl_syfanwei: '适用范围',
   cl_tongyong: '通用',
@@ -753,6 +756,8 @@ export const active = {
   cl_zanwu: '暂无',
   cl_qita: '其他',
   cjjiangxiang: '抽奖奖项',
+  cl_man: '满',
+  cl_keyong: '可用',
 }
 
 export const fnc = {
@@ -1007,6 +1012,7 @@ export const fnc = {
   day: '日',
   fyshuoming: '费用说明',
   danjia: '单价',
+  cjdanjia: '成交单价',
   jine: '金额',
   yuanbi: '原币',
   sfjine: '实付金额',
@@ -1058,6 +1064,9 @@ export const fnc = {
   yingfu: '应付',
   shishou: '实收',
   shifu: '实付',
+  youhui: '优惠',
+  xiaofei: '小费',
+  tuikuan: '退款',
   zjdiaobo: '资金调拨',
   tuanqi: '团期',
   hkriqi: '汇款日期',
@@ -1077,6 +1086,7 @@ export const fnc = {
   shoukuan: '收款',
   fukuan: '付款',
   duixiang: '对象',
+  zhikuan: '支款',
   dqzhuangtai: '当前状态',
   gnjpqishu: '国内票务期数',
   qzbianhao: '签证编号',
@@ -1121,6 +1131,93 @@ export const fnc = {
   xsfujian: '显示附件',
   ycfujian: '隐藏附件',
   ysjine: '应收金额',
+  guazhang: '挂账',
+  bmxuanze: '部门选择',
+  ryxuanze: '人员选择',
+  ctleixing: '参团类型',
+  bmriqi: '报名日期',
+  bmzrenshu: '总报名人数',
+  zcbmrenshu: '正常报名人数',
+  qxrenshu: '取消人数',
+  qtxtongji: '其他统计项',
+  nbbaoming: '内部报名',
+  B2BWAP: 'B2B/WAP网络报名',
+  cwdjshuoming: '财务单据说明',
+  yidadan: '已打单',
+  ptcnyshenhe: '平台出纳已审核',
+  yhcnyshenhe: '银行出纳已审核',
+  ytongguo: '已通过',
+  ysjine: '应收金额',
+  yishoujine: '已收金额',
+  tkjine: '退款金额',
+  ptshuijin: '平台税金',
+  ztjine: '在途金额',
+  wsjine: '未收金额',
+  khxinxi: '客户信息',
+  yszonge: '应收总额',
+  zaitu: '在途',
+  weishou: '未收',
+  sun: '损',
+  shousun: '收损',
+  dingdan: '订单',
+  lsbeizhu: '历史备注',
+  skdanju: '收款单据',
+  fkdanju: '付款单据',
+  w_ckmingcheng: '窗口名称',
+  w_ywrenyuan: '业务人员',
+  w_fzfangxiang: '负责方向',
+  w_djxinxi: '单据信息',
+  w_gong: '共',
+  w_chuangkou: '窗口',
+  w_shou: '收',
+  w_zhi: '支',
+  w_sqzhanghu: '授权账户',
+  w_ycldanju: '已处理单据',
+  w_dcldanju: '待处理单据',
+  w_zhbieming: '账户别名',
+  w_gsdgong: '公',
+  w_gsdsi: '私',
+  w_kscaozuo: '快速操作',
+  w_sygongzhang: '所有公账',
+  w_sysizhang: '所有私账',
+  w_sypingtai: '所有平台',
+  w_syzjinchi: '所有资金池',
+  w_syyhzhu: '所有银行账户',
+  w_syxjzhanghu: '所有现金账户',
+  a_xjzhanghu: '现金账户',
+  a_cnyshenhe: '出纳审核',
+  a_yshenhe: '已审核',
+  a_wshenhe: '未审核',
+  a_hkfkriqi: '汇款/付款日期',
+  a_hbdanju: '合并单据',
+  a_zhaiyao: '摘要',
+  a_hkrfkduixiang: '汇款人/付款对象',
+  a_hkfkshijian: '汇款时间/付款时间',
+  a_dhuanlv: '兑换率',
+  a_rminbi: '人民币',
+  a_qcyue: '期初余额',
+  a_fkshijian: '付款时间',
+  a_heji: '合计',
+  a_hbtips: '条合并为1条，外币总金额',
+  a_hbtips2: '，本位币总金额',
+  a_zongjine: '总金额',
+  a_qxzdanju: '请选择单据',
+  a_qxzjyriqi: '请选择交易日期！',
+  a_qxzjyfangshi: '请选择交易方式！',
+  a_yhzhanghu: '银行账户',
+  a_djztai: '单据状态',
+  a_shezhong: '审核中',
+  a_cnzancun: '出纳暂存',
+  a_ptzhanghu: '平台账户',
+  a_qsrjylshuihao: '请输入交易流水号',
+  a_zjczhanghu: '资金池账户',
+  a_xjrbaobiao: '现金日报表',
+  a_sqyue: '上期余额',
+  a_bqjffshenge: '本期借方发生额',
+  a_bqdffshenge: '本期贷方发生额',
+  a_bqyue: '本期余额',
+  a_jfbishu: '借方笔数',
+  a_dfbishu: '贷方笔数',
 }
 export const tips = {
   tips: '提示',
@@ -1179,7 +1276,11 @@ export const tips = {
   qishu: '期数',
   jiaoyifangshi: '交易方式',
   zwtqxinxi: '暂无团期信息',
-  zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！'
+  zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！',
+  jsrqbndyksriqi: '结束日期不能大于开始日期',
+  hqsjshibai: '数据获取失败！',
+  accWorkTips: '注：指定银行卡收支方向的单据会自动分发到各个窗口，管理员在设定时应注意以下窗口是否涵盖了所有的业务，如果没有请及时设定，以免造成单据混乱',
+  qrscchuangkou: '确定删除窗口？',
 }
 export const Operation = {
   Op_ShortName:'线路简称',
@@ -1308,6 +1409,11 @@ export const rule = {
   qtxhkshijian: '请选择汇款时间！',
   qxzjylshuihao: '请选择交易流水号！',
   qxzskzhanghao: '请选择收款账号！',
+  qtxckmingcheng: '请填写窗口名称',
+  qxzywuyuan: '请选择业务员',
+  qxzsyfangxiang: '请选择使用方向',
+  qsrjine: '请输入金额',
+  qsrzjine: '请输入总金额',
 }
 
 export const adm={

src/components/FinancialModule/FProcessManagement.vue

@@ -22,7 +22,7 @@
     ._cu{cursor: pointer;}
     ._none{opacity:0 ;}
     ._block{opacity: 1}
-    .InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
+    .InfoChangeLog{height: auto;background-color: #FFFFFF;}
     .changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
     .changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
     ._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}

src/components/FinancialModule/ReceivingOfficer.vue

@@ -7,17 +7,17 @@
     <div class="query-box">
       <ul>
         <li>
-          <button class="normalBtn" @click="addShow=true,text='新增'">{{$t('pub.addBtn')}}</button>
+          <button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button>
         </li>
       </ul>
     </div>
     <div v-loading="loading" class="cm_content _scrollbar" :class="addShow==true?'_edHeight':''">
       <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" >
         <tr>
-          <th>窗口名称</th>
-          <th>所属公司</th>
-          <th>业务人员</th>
-          <th>负责方向</th>
+          <th>{{$t('fnc.w_ckmingcheng')}}</th>
+          <th>{{$t('system.query_company')}}</th>
+          <th>{{$t('fnc.w_ywrenyuan')}}</th>
+          <th>{{$t('fnc.w_fzfangxiang')}}</th>
           <th>{{$t('system.table_operation')}}</th>
         </tr>
         <tr v-for="(item,index) in dataList" :key="index">
@@ -27,19 +27,19 @@
             <span v-for="(i,ix) in item.emList">{{i.emName}} <span v-if="ix!=item.emList.length-1">,</span> </span>
           </td>
           <td>
-            <span v-if="item.Direct==1">收款</span>
-            <span v-else-if="item.Direct==2">支款</span>
-            <span v-else>收支</span>
+            <span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span>
+            <span v-else-if="item.Direct==2">{{$t('fnc.zhikuan')}}</span>
+            <span v-else>{{$t('fnc.shouzhi')}}</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),text='修改'"></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')"></el-button>
               </el-tooltip>
               <!--<el-tooltip class="item" effect="dark" content="单据信息" placement="top-start">-->
                 <!--<el-button type="danger" class="iconfont icon-img-rili" circle @click="goUrlDetail('CashierWorkDetail',2,item.Name,item.ID,item.BranchId)"></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.ID)"></el-button>
               </el-tooltip>
             </el-row>
@@ -63,7 +63,7 @@
     <div class="_vMG_edit" :class="addShow==true?'edHeight':''">
       <el-row class="_margin_bottom_20">
         <el-col :span="20">
-          <p class="_tit">{{text}}窗口</p>
+          <p class="_tit">{{text}}{{$t('fnc.w_chuangkou')}}</p>
         </el-col>
         <el-col :span="4" class="_add_saveBtn">
           <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
@@ -91,7 +91,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="业务人员" prop="listArr">
+            <el-form-item :label="$t('fnc.w_ywrenyuan')" prop="listArr">
               <el-select
                 v-model="addMsg.listArr"
                 filterable
@@ -115,10 +115,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="负责方向" prop="Direct">
-              <el-radio v-model="addMsg.Direct" :label="1">收</el-radio>
-              <el-radio v-model="addMsg.Direct" :label="2">支</el-radio>
-              <el-radio v-model="addMsg.Direct" :label="3">收支</el-radio>
+            <el-form-item :label="$t('fnc.w_fzfangxiang')" prop="Direct">
+              <el-radio v-model="addMsg.Direct" :label="1">{{$t('fnc.w_shou')}}</el-radio>
+              <el-radio v-model="addMsg.Direct" :label="2">{{$t('fnc.w_zhi')}}</el-radio>
+              <el-radio v-model="addMsg.Direct" :label="3">{{$t('fnc.shouzhi')}}</el-radio>
             </el-form-item>
           </el-col>
         </el-row>
@@ -157,14 +157,14 @@
         text: '',
         rules: {
           Name: [
-            { required: true, message: '请填写窗口名称', trigger: 'blur' }
+            { required: true, message: this.$t('rule.qtxckmingcheng'), trigger: 'blur' }
           ],
           listArr: [
-            {type: 'array', required: true, editCurencymessage: '请选择业务员', trigger: 'blur' }
+            {type: 'array', required: true, editCurencymessage: this.$t('rule.qxzywuyuan'), trigger: 'blur' }
           ],BranchId:[
-            { required: true, message: '请选择公司', trigger: 'change' }
+            { required: true, message: this.$t('rule.company'), trigger: 'change' }
           ],Direct:[
-            { required: true, message: '请选择使用方向', trigger: 'change' }
+            { required: true, message: this.$t('rule.qxzsyfangxiang'), trigger: 'change' }
           ]
         },
       }
@@ -173,9 +173,9 @@
 
     }, methods: {
       financeinfoRemove: function(id){  // 删除
-        this.$confirm('确定删除窗口？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(this.$t('tips.qrscchuangkou'), this.$t('tips.tips'), {
+          confirmButtonText: this.$t('pub.sureBtn'),
+          cancelButtonText: this.$t('pub.cancelBtn'),
           type: 'warning'
         }).then(() => {
           this.apipost('Window_post_RemoveTwo',{ID:id}, res => {
@@ -189,7 +189,7 @@
         }).catch(() => {
           this.$message({
             type: 'info',
-            message: '已取消'
+            message: this.$t('hotel.hotel_HasBeenCancelled'),
           });
         });
       },

src/components/FinancialModule/TransferReport.vue

@@ -37,7 +37,7 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="6">
-            <el-form-item label="交易日期：">
+            <el-form-item :label="$t('fnc.jiaoyiriqi')+'：'">
               <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange" value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
@@ -49,24 +49,24 @@
           <span>
           </span>
           <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
-          <button class="normalBtn" @click="method5()">导出</button>
+          <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
         </li>
       </ul>
     </div>
     <div class="_fnDm_content" v-loading='loading'>
       <table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);">
         <tr>
-          <th colspan="8">四川和平国际旅行社有限公司现金日报表</th>
+          <th colspan="8">{{branchName}}{{$t('fnc.a_xjrbaobiao')}}</th>
         </tr>
         <tr>
-          <th>公司</th>
-          <th>银行</th>
-          <th>上期余额</th>
-          <th>本期借方发生额</th>
-          <th>本期贷方发生额</th>
-          <th>本期余额</th>
-          <th>借方笔数</th>
-          <th>贷方笔数</th>
+          <th>{{$t('system.table_company')}}</th>
+          <th>{{$t('fnc.yinhang')}}</th>
+          <th>{{$t('fnc.a_sqyue')}}</th>
+          <th>{{$t('fnc.a_bqjffshenge')}}</th>
+          <th>{{$t('fnc.a_bqdffshenge')}}</th>
+          <th>{{$t('fnc.a_bqyue')}}</th>
+          <th>{{$t('fnc.a_jfbishu')}}</th>
+          <th>{{$t('fnc.a_dfbishu')}}</th>
         </tr>
         <template v-for="item in dataObj.resultList">
           <tr>
@@ -153,6 +153,7 @@
         comPanyALLList: [],
         ALLMoney: [],
         dataObj: {},
+        branchName: ''
       }
     },
     created() {
@@ -161,6 +162,7 @@
     components: {},
     mounted() {
       let userInfo = this.getLocalStorage();
+      this.branchName = userInfo.GroupName
       this.getList();
       this.msg.EmployeeId= userInfo.EmployeeId;
     },