Skip to content

S
SuperMan
Commit 69a05c01 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents ea93d47c 12541d7b
Hide whitespace changes
Inline Side-by-side
Showing with 236 additions and 167 deletions
src/assets/common/lang/zh.js
View file @ 69a05c01
......@@ -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
View file @ 69a05c01
......@@ -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
View file @ 69a05c01
......@@ -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/CostType.vue
View file @ 69a05c01
......@@ -105,22 +105,22 @@
<el-form class="_info_box clearfix" label-width="110px">
<el-row v-if="transitionShow2">
<el-col :span="4" :gutter="35">
<el-form-item label="费用类型名称">
<el-form-item :label="$t('fnc.fylxmingcheng')">
<el-input placeholder="" v-model="msg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="类型层级">
<el-form-item :label="$t('fnc.cjleixing')">
<el-select v-model="msg.Tier" @change="getCostTypeList(1)">
<el-option label='不限' :value='0'></el-option>
<el-option label='一级' :value='1'></el-option>
<el-option label='二级' :value='2'></el-option>
<el-option label='三级' :value='3'></el-option>
<el-option :label='$t("pub.unlimitedSel")' :value='0'></el-option>
<el-option :label='$t("fnc.yiji")' :value='1'></el-option>
<el-option :label='$t("fnc.erji")' :value='2'></el-option>
<el-option :label='$t("fnc.sanji")' :value='3'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="上级类型">
<el-form-item :label="$t('fnc.shangjileixing')">
<el-select v-model="msg.ParentId">
<el-option v-for="(item,index) in CostTypeList2" :label='item.Name' :key="item.ID" :value='item.ID' ></el-option>
</el-select>
......@@ -146,8 +146,8 @@
<button class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()">{{$t('pub.searchBtn')}}</button>
<!-- <button type="button" class="normalBtn" @click="outerVisible=true">导入</button>
<button type="button" class="normalBtn" @click="downMuban()">下载导入模板</button> -->
<button class="normalBtn" @click="addShow=true,text='新增',addFun()" >新增</button>
<el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn'),addFun()" >{{$t('pub.addBtn')}}</button>
<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>
......@@ -166,8 +166,8 @@
<img class="_cmci_img" v-if="item.Type===3" src="../../assets/img/f_shouzhi.png" alt="">
</p>
<div class="_bumen" >
<p>摊账：{{item.IsShareAccount===0?'非摊账':'摊账'}}</p>
<p>营收报表：{{item.Is_Report===0?'不进入':'进入'}}</p>
<p>{{$t('fnc.tanzhang')}}：{{item.IsShareAccount===0?$t('fnc.feitanzhang'): $t('fnc.tanzhang')}}</p>
<p>{{$t('fnc.ysbaobiao')}}：{{item.Is_Report===0? $t('fnc.bujinru') : $t('fnc.jinru')}}</p>
<p class="_b_edit">
<!-- <button type="button" class="el-button el-tooltip item el-button--danger is-circle" aria-describedby="el-tooltip-694" tabindex="0" @click="financeinfoRemove(item.ID,item.Name)"><i class="el-icon-delete"></i></button> -->
<button v-if="msg.EmployeeID==910" type="button" class="el-button el-tooltip item el-button--primary is-circle" aria-describedby="el-tooltip-5781" tabindex="0" @click="editCurency(item.ID),text='修改'"><i class="el-icon-edit"></i></button>
......@@ -179,21 +179,21 @@
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-if="transitionShow" >
<thead>
<tr>
<th width="200px">一级名称</th>
<th width="150px">二级名称</th>
<th width="150px">三级名称</th>
<th width="150px">适用公司</th>
<th width="150px">适用部门</th>
<th width="150px">适用岗位</th>
<th width="150px">适用人员</th>
<th>费用方向</th>
<th>摊账</th>
<th width="200px">{{$t('fnc.yijimingcheng')}}</th>
<th width="150px">{{$t('fnc.erjimingcheng')}}</th>
<th width="150px">{{$t('fnc.sanjimingcheng')}}</th>
<th width="150px">{{$t('fnc.sygongsi')}}</th>
<th width="150px">{{$t('fnc.sybumen')}}</th>
<th width="150px">{{$t('fnc.sygangwei')}}</th>
<th width="150px">{{$t('fnc.syrenyuan')}}</th>
<th>{{$t('fnc.feiyongfangxiang')}}</th>
<th>{{$t('fnc.tanzhang')}}</th>
</tr>
</thead>
<tbody class="po_content_item">
<tr v-for="(item,index) in CostTypeTreeList" :key="index" v-loading="loading">
<td width="200px">
<span class="cursorpointer" v-if="msg.EmployeeID==910" @click="editCurency(item.ID),text='修改'">{{item.Name}}</span>
<span class="cursorpointer" v-if="msg.EmployeeID==910" @click="editCurency(item.ID),text=$t('pub.updateMsg')">{{item.Name}}</span>
<span class="cursorpointer" v-else>{{item.Name}}</span>
</td>
<template v-if="item.ChildList.length>0">
......@@ -202,7 +202,7 @@
<tbody>
<tr v-for="(son,sIndex) in item.ChildList">
<td style="" width="150px">
<span class="cursorpointer" v-if='msg.EmployeeID==910' @click="editCurency(son.ID),text='修改'">{{son.Name}}</span>
<span class="cursorpointer" v-if='msg.EmployeeID==910' @click="editCurency(son.ID),text=$t('pub.updateMsg')">{{son.Name}}</span>
<span class="cursorpointer" v-else>{{son.Name}}</span></td>
<template v-if="son.ChildList.length>0">
<td colspan="7" style="padding:0">
......@@ -210,16 +210,16 @@
<tbody>
<tr v-for="(grSon,gsIndex) in son.ChildList">
<td class="cursorpointer_last" width="150px">
<span class="cursorpointer" v-if='msg.EmployeeID==910' @click="editCurency(grSon.ID),text='修改'">{{grSon.Name}} <i @click.stop="financeinfoRemove(grSon.ID,grSon.Name)" class="el-icon-delete"></i></span>
<span class="cursorpointer" v-if='msg.EmployeeID==910' @click="editCurency(grSon.ID),text=$t('pub.updateMsg')">{{grSon.Name}} <i @click.stop="financeinfoRemove(grSon.ID,grSon.Name)" class="el-icon-delete"></i></span>
<span class="cursorpointer" v-else>{{grSon.Name}}</span></td>
<td width="150px">{{grSon.BName}}</td>
<td width="150px">{{grSon.DeName}}</td>
<td width="150px">{{grSon.PName}}</td>
<td width="150px">{{grSon.RName}}</td>
<td style="">
<span v-if="grSon.Type===1">收入</span>
<span v-if="grSon.Type===2">支出</span>
<span v-if="grSon.Type===3">收支</span>
<span v-if="grSon.Type===1">{{$t('restaurant.res_income')}}</span>
<span v-if="grSon.Type===2">{{$t('restaurant.res_outcome')}}</span>
<span v-if="grSon.Type===3">{{$t('fnc.shouzhi')}}</span>
</td>
<td style="">
<span class="_yuan" v-if="grSon.Type==1"></span>
......@@ -237,9 +237,9 @@
<td width="150px">{{son.PName}}</td>
<td width="150px">{{son.RName}}</td>
<td style="">
<span v-if="son.Type===1">收入</span>
<span v-if="son.Type===2">支出</span>
<span v-if="son.Type===3">收支</span>
<span v-if="son.Type===1">{{$t('restaurant.res_income')}}</span>
<span v-if="son.Type===2">{{$t('restaurant.res_outcome')}}</span>
<span v-if="son.Type===3">{{$t('fnc.shouzhi')}}</span>
</td>
<td style="">
<span class="_yuan" v-if="son.Type==1"></span>
......@@ -259,9 +259,9 @@
<td width="150px">{{item.PName}}</td>
<td width="150px">{{item.RName}}</td>
<td>
<span v-if="item.Type===1">收入</span>
<span v-if="item.Type===2">支出</span>
<span v-if="item.Type===3">收支</span>
<span v-if="item.Type===1">{{$t('restaurant.res_income')}}</span>
<span v-if="item.Type===2">{{$t('restaurant.res_outcome')}}</span>
<span v-if="item.Type===3">{{$t('fnc.shouzhi')}}</span>
</td>
<td>
<span class="_yuan" v-if="item.Type==1"></span>
......@@ -314,7 +314,7 @@
<div class="_vMG_edit" :class="addShow==true?'edHeight':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{text}}费用类型</p>
<p class="_tit">{{text}}{{$t('fnc.feiyongleixing')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
......@@ -324,36 +324,36 @@
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item label="名称：" prop="Name">
<el-form-item :label="$t('fnc.Name')" prop="Name">
<el-input v-model="addMsg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="类型层级：" prop="Tier">
<el-form-item :label="$t('fnc.cjleixing')" prop="Tier">
<el-select filterable v-model='addMsg.Tier' @change="getCostTypeList(2)">
<el-option label='一级' :value='1'></el-option>
<el-option label='二级' :value='2'></el-option>
<el-option label='三级' :value='3'></el-option>
<el-option :label='$t('fnc.yiji')' :value='1'></el-option>
<el-option :label='$t('fnc.erji')' :value='2'></el-option>
<el-option :label='$t('fnc.sanji')' :value='3'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="上级类型：">
<el-form-item :label="$t('fnc.shangjileixing') + '：'">
<el-select filterable v-model='addMsg.ParentId' >
<el-option v-for="(item,index) in CostTypeList" :label='item.Name' :key="item.ID" :value='item.ID' ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="排序：">
<el-form-item :label="$t('fnc.table_rank')+'：'">
<el-input v-model="addMsg.Sort"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="适用公司：">
<el-form-item :label="$t('fnc.sygongsi') + '：'">
<el-select filterable v-model='addMsg.BranchId' >
<!--<el-select filterable v-model='addMsg.BranchId' @change="getDepartmentList()">-->
<el-option label='通用' :value='-1'></el-option>
<el-option :label='$t('active.cl_tongyong')' :value='-1'></el-option>
<el-option v-for='item in companyList'
:label='item.BName'
:value='item.Id'
......@@ -363,10 +363,10 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="适用部门：">
<el-form-item :label="$t('fnc.sybumen') + '：'">
<!--<el-select filterable v-model='addMsg.DepartmentID' @change="getPostList()">-->
<el-select filterable v-model='addMsg.DepartmentID' >
<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'
......@@ -376,10 +376,10 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="适用岗位：">
<el-form-item :label="$t('fnc.sygangwei') + '：'">
<el-select filterable v-model='addMsg.PostID' >
<!--<el-select filterable v-model='addMsg.PostID' @change="getEmployeeList()">-->
<el-option label='通用' :value='-1'></el-option>
<el-option :label='$t('active.cl_tongyong')' :value='-1'></el-option>
<el-option v-for='item in PostList'
:label='item.PostName'
:value='item.PostId'
......@@ -389,9 +389,9 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="适用人员：" class="_EmployeeIDList">
<el-form-item :label="$t('fnc.syrenyuan') + '：'">
<el-select filterable multiple v-model='EmployeeIDList' @change="EmployeeIDRule">
<el-option label='通用' :value='-1'></el-option>
<el-option :label='$t('active.cl_tongyong')' :value='-1'></el-option>
<el-option v-for='item in EmployeeList'
:disabled = 'item.disabled'
:label='item.EmName'
......@@ -402,22 +402,22 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="费用方向：">
<el-radio v-model="addMsg.Type" :label="1">收入</el-radio>
<el-radio v-model="addMsg.Type" :label="2">支出</el-radio>
<el-radio v-model="addMsg.Type" :label="3">收支</el-radio>
<el-form-item :label="$t('fnc.feiyongfangxiang') + '：'">
<el-radio v-model="addMsg.Type" :label="1">{{$t('restaurant.res_income')}}</el-radio>
<el-radio v-model="addMsg.Type" :label="2">{{$t('restaurant.res_outcome')}}</el-radio>
<el-radio v-model="addMsg.Type" :label="3">{{$t('fnc.shouzhi')}}</el-radio>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="摊账：">
<el-radio v-model="addMsg.IsShareAccount" :label="1">是</el-radio>
<el-radio v-model="addMsg.IsShareAccount" :label="0">否</el-radio>
<el-form-item :label="$t('fnc.tanzhang') + '：'">
<el-radio v-model="addMsg.IsShareAccount" :label="1">{{$t('fnc.yes')}}</el-radio>
<el-radio v-model="addMsg.IsShareAccount" :label="0">{{$t('fnc.fou')}}</el-radio>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="营收报表：">
<el-radio v-model="addMsg.Is_Report" :label="0">不进入</el-radio>
<el-radio v-model="addMsg.Is_Report" :label="1">进入</el-radio>
<el-form-item :label="$t('fnc.ysbaobiao') + '：'">
<el-radio v-model="addMsg.Is_Report" :label="0">{{$t('fnc.bujinru')}}</el-radio>
<el-radio v-model="addMsg.Is_Report" :label="1">{{$t('fnc.jinru')}}</el-radio>
</el-form-item>
</el-col>
</el-row>
......@@ -436,12 +436,12 @@
:total=total>
</el-pagination>
</div>
<el-dialog custom-class='w700' title="批量导入" :visible.sync="outerVisible" center>
<el-dialog custom-class='w700' :title="$t('Airticket.Air_bulkImport')" :visible.sync="outerVisible" center>
<el-upload drag class="upload-demo" ref="upload" :action="getImportFileUrl()" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div slot="tip" class="el-upload__tip">只能上传Excel文件，重复的费用类型不会添加哦</div>
<div class="el-upload__text">{{$t('tips.tuodongwenjian')}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
<div slot="tip" class="el-upload__tip">{{$t('fnc.znengExcel')}}</div>
</el-upload>
</el-dialog>
</div>
......@@ -515,10 +515,10 @@
},
rules: {//表单必填验证
Name: [
{ required: true, message: '请填写费用名称', trigger: 'blur' }
{ required: true, message: this.$t('rule.qtxfymingcheng'), trigger: 'blur' }
],
Tier: [
{ required: true, message: '请选择类型层级', trigger: 'change' }
{ required: true, message: this.$t('rule.qxzlxcengji'), trigger: 'change' }
]
},
outerVisible: false,
......@@ -706,7 +706,7 @@
console.log(file)
const excel = file.type === "application/vnd.ms-excel";
if (!excel) {
this.Error("上传文件只能是 excel 格式!");
this.Error(this.$t('tips.shangchuanExcel'));
}
return excel;
},
......@@ -763,7 +763,7 @@
}
},
financeinfoRemove(id,text){ // 删除货币
this.$confirm('确定删除'+text+'费用类型？', '提示', {
this.$confirm(this.$t('tips.qrsc')+text+this.$t('fnc.feiyongleixing'), '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
......
src/components/systemManagement/FineBalance.vue
View file @ 69a05c01
......@@ -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/currencyManagement.vue
View file @ 69a05c01
......@@ -120,7 +120,7 @@
<li>
<button class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="addShow=true,addCuren=true" >{{$t('system.btn_addCoin')}}</button>
<el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
<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>
......@@ -128,7 +128,7 @@
</ul>
</div>
<div class="cm_content _scrollbar" :class="addShow==true?'_edHeight':''">
<p class="_tips">以下汇率系统将每隔30分钟实时更新一次</p>
<p class="_tips">{{$t('tips.sxhuilv')}}</p>
<div class="clearfix" v-if="transitionShow" v-loading="loading2">
<div class="cmc_item" v-for="(item,index) in tableInfo">
<div class="cmci_top" :class="item.IsStandardCurrency==1?'':'_benwei'">
......@@ -140,29 +140,29 @@
</p>
</div>
<div class="cmci_cen">
<p class="clearfix"><span class="fl">本期汇率</span><span class="fr">{{item.Rate}}</span></p>
<p class="clearfix"><span class="fl">当前汇率 <i class="iconfont icon-shuaxin" v-if="item.IsStandardCurrency!=1" @click="getCurrentRate(item.ID,index)"></i></span><span class="fr fc_green">{{item.CurrentRate}}</span></p>
<p class="clearfix"><span class="fl">资金余额</span><span class="fr _underline" @click="goUrl('FineBalance',item.ID,item.Name)">{{item.Money}}</span></p>
<p class="clearfix"><span class="fl">{{$t('fnc.benqihuilv')}}</span><span class="fr">{{item.Rate}}</span></p>
<p class="clearfix"><span class="fl">{{$t('fnc.danqgianhuilv')}} <i class="iconfont icon-shuaxin" v-if="item.IsStandardCurrency!=1" @click="getCurrentRate(item.ID,index)"></i></span><span class="fr fc_green">{{item.CurrentRate}}</span></p>
<p class="clearfix"><span class="fl">{{$t('fnc.zjinyue')}}</span><span class="fr _underline" @click="goUrl('FineBalance',item.ID,item.Name)">{{item.Money}}</span></p>
</div>
<div class="cmci_bot">
<el-button-group>
<el-button type="primary" @click="editCurency(item.ID)">修改</el-button>
<el-button type="danger" @click="financeinfoRemove(item.ID,item.Name)">删除</el-button>
<el-button type="warning" v-if="item.IsStandardCurrency!=1" @click="setStandardTips(item.ID,item.Name)">本位</el-button>
<el-button type="primary" @click="editCurency(item.ID)">{{$t('pub.updateMsg')}}</el-button>
<el-button type="danger" @click="financeinfoRemove(item.ID,item.Name)">{{$t('system.table_delete')}}</el-button>
<el-button type="warning" v-if="item.IsStandardCurrency!=1" @click="setStandardTips(item.ID,item.Name)">{{$t('fnc.benwei')}}</el-button>
</el-button-group>
</div>
</div>
</div>
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-if="transitionShow2" v-loading="loading2">
<tr>
<th>货币名称</th>
<th>货币代码</th>
<th>是否本位币</th>
<th>初始汇率</th>
<th>本期汇率</th>
<th>当前汇率</th>
<th>资金金额</th>
<th>操作</th>
<th>{{$t('system.table_currencyName')}}</th>
<th>{{$t('system.table_currencyCode')}}</th>
<th>{{$t('fnc.sfbenweibi')}}</th>
<th>{{$t('fnc.chushihuilv')}}</th>
<th>{{$t('fnc.benqihuilv')}}</th>
<th>{{$t('fnc.danqgianhuilv')}}</th>
<th>{{$t('fnc.zjjiner')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in tableInfo" :key="index">
<td>{{item.Name}}</td>
......@@ -181,14 +181,14 @@
<td><span class="_underline" @click="goUrl('FineBalance',item.ID,item.Name)">{{item.Money}}</span></td>
<td>
<el-button-group size='mini'>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text='修改'"></el-button>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text=$t('system.table_edit')"></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" @click="financeinfoRemove(item.ID,item.Name)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="设置本位币" placement="top-start">
<el-button type="warning" class="iconfont" v-if="item.IsStandardCurrency!=1" @click="setStandardTips(item.ID,item.Name)">本</el-button>
<el-tooltip class="item" effect="dark" :content="$t('fnc.szbweibi')" placement="top-start">
<el-button type="warning" class="iconfont" v-if="item.IsStandardCurrency!=1" @click="setStandardTips(item.ID,item.Name)">{{$t('Airticket.Air_ben')}}</el-button>
</el-tooltip>
</el-button-group>
</td>
......@@ -210,31 +210,31 @@
</div>
<div class="_vMG_edit" :class="addShow==true?'edHeight':''">
<p class="_tit">新增币种</p>
<p class="_tit">{{$t('fnc.')}}</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.b_hbmingcheng')" prop="Name">
<el-input v-model="addMsg.Name" class="w135"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="货币代码：" prop="Code">
<el-form-item :label="$t('fnc.b_hbdaima')" prop="Code">
<el-input v-model="addMsg.Code" class="w135"></el-input>
</el-form-item>
</li>
<li v-if="ed==false">
<el-form-item label="初始汇率：" prop="Rate">
<el-form-item :label="$t('fnc.b_cshuilv')" prop="Rate">
<el-input v-model="addMsg.Rate" class="w135"></el-input>
</el-form-item>
</li>
<li v-else>
<el-form-item label="初始汇率：" prop="Rate">
<el-form-item :label="$t('fnc.b_cshuilv')" prop="Rate">
<el-input v-model="addMsg.Rate" disabled class="w135"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="是否本位币：">
<el-form-item :label="$t('fnc.sfbenweibi')+ '：'">
<el-switch v-model="addMsg.IsStandardCurrency"
active-value='1'
inactive-value='0'
......@@ -254,42 +254,42 @@
</div>
</div>
<div class="_vMG_edit" :class="addCuren==false?'edHeight':''">
<p class="_tit">期末调汇</p>
<p class="_tit">{{$t('fnc.qmtiaohui')}}</p>
<el-form class="_info_box clearfix" :model="SetProfitLossMsg" ref="SetProfitLossMsg" :rules="rules" label-width="100px">
<ul class="clearfix">
<li>
<el-form-item label="期初汇率：">
<el-form-item :label="$t('fnc.b_qchuilv')">
<el-input v-model="SetProfitLossMsg.initRate" disabled="" class="w135"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="期末汇率：" prop="EndRate">
<el-form-item :label="$t('fnc.qmhuilv')" prop="EndRate">
<el-input v-model="SetProfitLossMsg.EndRate" @change="Calculation()" class="w135"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="选择期数：" prop="TermNum">
<el-form-item :label="$t('fnc.xzqishu')" prop="TermNum">
<el-date-picker
class="w135"
:picker-options="pickerOptions1"
v-model="SetProfitLossMsg.TermNum"
value-format="yyyy-MM-dd"
type="month"
placeholder="选择日期">
:laceholder="$t('admin.admin_choDate')">
</el-date-picker>
</el-form-item>
</li>
<li class="_yingkui">
<p v-if="moneyDate.ProfitLoss<0">亏损：<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss>0">盈利：<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss==0">盈亏：<span class="fc_green">0</span></p>
<p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.kuisun')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss>0">{{$t('fnc.yingli')}}<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.kuisun')}}<span class="fc_green">0</span></p>
</li>
</ul>
</el-form>
<div>
<ul class="clearfix" style="text-align: right;">
<li class="_add_saveBtn"style="float: initial;" >
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">确认提交</button>
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>
</li>
</ul>
......@@ -351,19 +351,19 @@
},
rules: {//表单必填验证
Name: [
{ required: true, message: '请填写货币名称', trigger: 'blur' }
{ required: true, message: this.$t('rule.qtxhbmingcheng'), trigger: 'blur' }
],
Code: [
{ required: true, message: '请填写货币代码', trigger: 'blur' }
{ required: true, message: this.$t('rule.qtxhbdaima'), trigger: 'blur' }
],
Rate:[
{ required: true, message: '请输入汇率', trigger: 'blur' }
{ required: true, message: this.$t('rule.qsrhuilv'), trigger: 'blur' }
],
TermNum:[
{ required: true, message: '请选择期数', trigger: 'blur' }
{ required: true, message: this.$t('rule.qxzqishu'), trigger: 'blur' }
],
EndRate:[
{ required: true, message: '请填写期末汇率', trigger: 'blur' }
{ required: true, message: this.$t('rule.qtxqmhuilv'), trigger: 'blur' }
]
},
transitionShow:false,
......@@ -437,9 +437,9 @@
// console.log(((this.moneyDate.currentR-this.moneyDate.LastR)*this.moneyDate.Money).toFixed(2))
},
financeinfoRemove(id,text){ // 删除货币
this.$confirm('确定删除'+text+'货币？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.qrsc')+text+this.$t('tips.huobi'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('financeinfo_post_Remove',{ID:id}, res => {
......@@ -453,7 +453,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
message: this.$t('hotel.hotel_HasBeenCancelled')
});
});
},
......@@ -492,16 +492,16 @@
}
},
setStandardTips(id,text){ // 设置本位币提示
this.$confirm('确认设置本位币为'+text, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.qrszwbwbb')+text, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.setStandard(id)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
message: this.$t('hotel.hotel_HasBeenCancelled')
});
});
},
......@@ -598,20 +598,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')
});
});
},
......@@ -621,11 +621,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 => {})
},
......
src/components/systemManagement/institutionsManagement.vue
View file @ 69a05c01
......@@ -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);
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment