Skip to content

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

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

parents 29c2eabf d159e8c8
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 42 deletions
src/assets/common/lang/zh.js
View file @ fe29e3ae
......@@ -883,6 +883,7 @@ export const fnc = {
jigou: '机构',
qsrneirong: '请输入内容',
zhanghuleixing: '账户类型',
zhfenlei: '账户分类',
yueacc: '余额',
bwbyue: '本位币余额',
caozuoriqi: '操作日期',
......@@ -929,7 +930,12 @@ export const fnc = {
tjzhanghu: '添加账户',
sfduigong: '是否对公',
sybumen: '适用部门：',
shanghuhao: '商户号',
qqdizhi: '请求地址',
zfxinxi: '支付信息',
shsiyao: '商户私钥',
ptgongyao: '平台公钥',
banbenhao: '版本号',
}
export const tips = {
tips: '提示',
......@@ -979,6 +985,8 @@ export const tips = {
znengExcel: '只能上传Excel文件，重复的费用类型不会添加哦',
shangchuanExcel: '上传文件只能是 excel 格式!',
feiyongleixing: '费用类型？',
qxzzhleixing: '请选择账户类型!',
dzfpzxxdelete: '的支付信息配置?删除后不可撤回！',
}
export const Operation = {
Op_ShortName:'线路简称',
......@@ -1055,4 +1063,13 @@ export const rule = {
qxzlxcengji: '请选择类型层级',
qtxzhmingcheng: '请填写账户名称',
qxzsybumen: '请选择适用部门',
qsrshuhao: '请输入商户号',
qsrshsyao: '请输入商户私钥',
qsrptsiyao: '请输入平台公钥',
qsrqqdizhi: '请输入请求地址',
qsrbbenhao: '请输入版本号',
qxzssgongsi: '请选择所属公司',
qxzshleixing: '请选择账户类型',
qxzzhfenlei: '请选择账户分类',
qxzzhanghu: '请选择账户',
}
src/components/FinancialModule/paySetting.vue
View file @ fe29e3ae
......@@ -65,14 +65,14 @@
<ul>
<li>
<span>
<em>商户号：</em>
<em>{{$t('fnc.shanghuhao')}}：</em>
<el-input placeholder="" class="w210" v-model="msg.Mch_Id"></el-input>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="addShow=true,text='新增',IsAdd=true,cancelEdit(),disabledOption()" >新增</button>
<el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn'),IsAdd=true,cancelEdit(),disabledOption()" >{{$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>
......@@ -87,12 +87,12 @@
<p class="over_ellipsis ps_num PingFangSC">{{item.Mch_Id}}</p>
</el-tooltip>
<p class="ps_btn">
<i class="iconfont icon-bianji-smal" @click="editPay(item.ID),text='修改',IsAdd=false,addShow=true,OnlinePay_post_GetBranchList(item.ID)"></i>
<i class="iconfont icon-bianji-smal" @click="editPay(item.ID),text=$t('pub.updateMsg'),IsAdd=false,addShow=true,OnlinePay_post_GetBranchList(item.ID)"></i>
<i class="iconfont icon-img_delete_small" @click="deletePay(item.ID,item.Mch_Id)"></i>
</p>
</div>
<div class="ps_com">
<p>所属公司：</p>
<p>{{$t('system.query_company')}}：</p>
<el-tooltip class="item" effect="dark" :content="item.allName" placement="top-end">
<p class="over_ellipsis">
<template v-for="(son,si) in item.BranchName">
......@@ -102,7 +102,7 @@
</el-tooltip>
</div>
<p class="ps_adr">
<span>请求地址：</span>
<span>{{$t('fnc.qqdizhi')}}：</span>
<el-tooltip class="item" effect="dark" :content="item.Req_URL" placement="top-end">
<span class="over_ellipsis">{{item.Req_URL}}</span>
</el-tooltip>
......@@ -111,10 +111,10 @@
</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>{{$t('fnc.shanghuhao')}}</th>
<th>{{$t('fnc.qqdizhi')}}</th>
<!-- <th>版本号</th> -->
<th>账户类型</th>
<th>{{$t('fnc.zhanghuleixing')}}</th>
<!-- <th>账户分类</th> -->
<!-- <th>账户</th>
<th>所属公司</th> -->
......@@ -130,10 +130,10 @@
<!-- <td>{{item.ClientName}}</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="editPay(item.ID),text='修改',IsAdd=false,addShow=true,OnlinePay_post_GetBranchList(item.ID)"></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="editPay(item.ID),text=$t('pub.updateMsg'),IsAdd=false,addShow=true,OnlinePay_post_GetBranchList(item.ID)"></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="deletePay(item.ID,item.Mch_Id)"></el-button>
</el-tooltip>
</el-row>
......@@ -155,38 +155,38 @@
</div>
</div>
<div class="_vMG_edit" :class="addShow==true?'edHeight':''">
<p class="_tit">{{text}}支付信息</p>
<p class="_tit">{{text}}{{$t('fnc.zfxinxi')}}</p>
<el-form :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="6" :gutter="35">
<el-form-item label="商户号：" prop="Mch_Id">
<el-form-item :label="$t('fnc.shanghuhao')+'：'" prop="Mch_Id">
<el-input v-model="addMsg.Mch_Id" class="" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item label="商户私钥：" prop="Mch_PrivateKey">
<el-form-item :label="$t('fnc.shsiyao')+'：'" prop="Mch_PrivateKey">
<el-input v-model="addMsg.Mch_PrivateKey" class="" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item label="平台公钥：" prop="Wft_PublicKey">
<el-form-item :label="$t('fnc.ptgongyao')+'：'" prop="Wft_PublicKey">
<el-input v-model="addMsg.Wft_PublicKey" class="" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item label="请求地址：" prop="Req_URL">
<el-form-item :label="$t('fnc.qqdizhi')+'：'" prop="Req_URL">
<el-input v-model="addMsg.Req_URL" class="" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" :gutter="35">
<el-form-item label="版本号：" prop="Version">
<el-form-item :label="$t('fnc.banbenhao')+'：'" prop="Version">
<el-input v-model="addMsg.Version" class="" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账户类型：" prop="AccountType" >
<el-form-item :label="$t('fnc.zhanghuleixing')+'：'" prop="AccountType" >
<el-select filterable v-model='addMsg.AccountType' @change="claerAcc()">
<el-option v-for='item in AccList'
:label='item.Name'
......@@ -197,7 +197,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账户分类：" prop="BankType">
<el-form-item :label="$t('fnc.zhfenlei')+'：'" prop="BankType">
<el-select filterable v-model='addMsg.BankType' @change="getAccountList(addMsg.BankType,1)">
<el-option v-for='item in GetAccountType'
:label='item.Name'
......@@ -208,7 +208,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账户：" prop="BankID">
<el-form-item :label="$t('fnc.acc')+'：'" prop="BankID">
<el-select filterable v-model='addMsg.BankID'>
<el-option v-for='item in accountList'
:label='item.allName'
......@@ -219,9 +219,9 @@
</el-form-item>
</el-col>
<el-col :span="7" :gutter="35">
<el-form-item label="所属公司：" prop="seleRelationList">
<el-form-item :label="$t('fnc.ssuogongsi')+'：'" prop="seleRelationList">
<el-select filterable multiple collapse-tags v-model='addMsg.seleRelationList' @change="disabledOption" class="seleRelationList">
<el-option label='通用' value='-1' key='-1' :disabled="allDisabled&&IsAdd"></el-option>
<el-option :label='$t("active.cl_tongyong")' value='-1' key='-1' :disabled="allDisabled&&IsAdd"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
......@@ -232,7 +232,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态">
<el-form-item :label="$t('admin.admin_status')+'：'" >
<el-switch v-model="addMsg.Status" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
</el-col>
......@@ -288,25 +288,25 @@ export default {
IsAdd:false,
rules: {//表单必填验证
Mch_Id: [
{ required: true, message: '请输入商户号', trigger: 'blur' }
{ required: true, message: this.$t('rule.qsrshuhao'), trigger: 'blur' }
],
Mch_PrivateKey: [
{ required: true, message: '请输入商户私钥', trigger: 'blur' }
{ required: true, message: this.$t('rule.qsrshsyao'), trigger: 'blur' }
],Wft_PublicKey: [
{ required: true, message: '请输入平台公钥', trigger: 'blur' }
{ required: true, message: this.$t('rule.qsrptsiyao'), trigger: 'blur' }
],Req_URL: [
{ required: true, message: '请输入请求地址', trigger: 'blur' }
{ required: true, message: this.$t('rule.qsrqqdizhi'), trigger: 'blur' }
],Version: [
{ required: true, message: '请输入版本号', trigger: 'blur' }
{ required: true, message: this.$t('rule.qsrbbenhao'), trigger: 'blur' }
],seleRelationList: [
{ required: true, message: '请选择所属公司', trigger: 'change' }
{ required: true, message: this.$t('rule.qxzssgongsi'), trigger: 'change' }
],AccountType: [
{ required: true, message: '请选择账户类型', trigger: 'change' }
{ required: true, message: this.$t('rule.qxzshleixing'), trigger: 'change' }
],BankType: [
{ required: true, message: '请选择账户分类', trigger: 'change' }
{ required: true, message: this.$t('rule.qxzzhfenlei'), trigger: 'change' }
]
,BankID: [
{ required: true, message: '请选择账户', trigger: 'change' }
{ required: true, message: this.$t('rule.qxzzhanghu'), trigger: 'change' }
]
},
transitionShow:false,
......@@ -402,7 +402,7 @@ export default {
this.BankAccount_post_GetCashPoolList()
}
}else{
return this.$message.success('请选择账户类型!')
return this.$message.success(this.$t('tips.qxzzhleixing'))
}
},
BankAccount_post_GetPlatformList(i){ //获取平台账户
......@@ -504,9 +504,9 @@ export default {
}, err => {})
},
deletePay(ID,Name){ //删除
this.$confirm('是否删除'+'‘'+Name+'’'+'的支付信息配置?删除后不可撤回！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.shifoushanchu')+'‘'+Name+'’'+this.$t('tips.dzfpzxxdelete'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('OnlinePay_post_Remove',{ID:ID}, res => {
......@@ -520,7 +520,7 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
message: this.$t('hotel.hotel_HasBeenCancelled')
});
});
},
......
src/components/systemManagement/AccountType.vue
View file @ fe29e3ae
......@@ -473,9 +473,9 @@
isdelete(ID){
this.deleteID = ID;
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips') ,{
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
......
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