Skip to content

S
SuperMan
Commit 64ff185a authored by youjie's avatar youjie
Browse files
Options

no message

parent 9a423c62
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 26 deletions
src/components/systemManagement/ForeignCurrencyHL/ForeignCurrencyHL.vue
View file @ 64ff185a
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<li> <li>
<span> <span>
<span> <span>
<em>本位币种</em> <em>本位币</em>
<el-select filterable v-model='msg.StandardCurrencyId' :placeholder="$t('rule.qxzbzhong')" class=" _border_b_1"> <el-select filterable v-model='msg.StandardCurrencyId' :placeholder="$t('rule.qxzbzhong')" class=" _border_b_1">
<el-option label='不限' value='-1' key='-1'></el-option> <el-option label='不限' value='-1' key='-1'></el-option>
<el-option v-for='item in coinGetList' <el-option v-for='item in coinGetList'
...@@ -201,8 +201,8 @@ ...@@ -201,8 +201,8 @@
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="本位币种" prop="StandardCurrencyId"> <el-form-item label="本位币" prop="StandardCurrencyId">
<el-select filterable v-model='addMsg.StandardCurrencyId' placeholder="请选择本位币种" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1"> <el-select filterable v-model='addMsg.StandardCurrencyId' placeholder="请选择本位币" class=" _border_b_1">
<el-option v-for='item in coinGetList' <el-option v-for='item in coinGetList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
</li> </li>
<li> <li>
<el-form-item label="汇率" prop="CurrentRate"> <el-form-item label="汇率" prop="CurrentRate">
<el-input-number class="w200" v-model="addMsg.CurrentRate" :min="0" @change="getRate"></el-input-number> <el-input v-model="addMsg.CurrentRate" @change="getRate"></el-input>
</el-form-item> </el-form-item>
</li> </li>
<template v-if="dialogTitle!='上调'"> <template v-if="dialogTitle!='上调'">
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
<div> <div>
<ul class="clearfix" style="text-align: right;"> <ul class="clearfix" style="text-align: right;">
<li class="_add_saveBtn" style="float: initial;" > <li class="_add_saveBtn" style="float: initial;" >
<button type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> <button v-loading="loading" type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
</li> </li>
</ul> </ul>
...@@ -264,6 +264,7 @@ ...@@ -264,6 +264,7 @@
total:0, total:0,
currentPage: 1, currentPage: 1,
loading2:true, loading2:true,
loading:false,
tableInfo:'', tableInfo:'',
addShow:false, addShow:false,
noData:false, noData:false,
...@@ -273,10 +274,11 @@ ...@@ -273,10 +274,11 @@
{ required: true, message: '请选择币种', trigger: 'change' } { required: true, message: '请选择币种', trigger: 'change' }
], ],
StandardCurrencyId: [ StandardCurrencyId: [
{ required: true, message: '请选择本位币种', trigger: 'change' } { required: true, message: '请选择本位币', trigger: 'change' }
], ],
CurrentRate:[ CurrentRate:[
{ required: true, message: '请输入汇率', trigger: 'blur' } { required: true, message: '请输入汇率', trigger: 'blur' },
{pattern: /^\d+$|^\d*\.\d+$/g, message:'请输入正确的汇率数'}
], ],
StartTime:[ StartTime:[
{ required: true, message: '请选择开始时间', trigger: 'change' } { required: true, message: '请选择开始时间', trigger: 'change' }
...@@ -314,7 +316,7 @@ ...@@ -314,7 +316,7 @@
this.dialogTitle = '上调' this.dialogTitle = '上调'
}, },
getRate(value){ getRate(value){
return this.moneyFormatB(value) this.addMsg.CurrentRate = this.moneyFormatB(value)
}, },
financeinfo_post_GetList(TCID){ // 获取币种 financeinfo_post_GetList(TCID){ // 获取币种
this.apipost('financeinfo_post_GetList', this.apipost('financeinfo_post_GetList',
...@@ -331,11 +333,12 @@ ...@@ -331,11 +333,12 @@
StartTime:'', StartTime:'',
EndTime:'', EndTime:'',
} }
this.addShow = false
}, },
initTableInfo(){ initTableInfo(){
this.tableInfo = []; this.tableInfo = [];
this.loading2 = true; this.loading2 = true;
this.apipost('financeinfo_post_GetCurrencyForeignHistoryPageList',this.msg, res => { this.apipost('financeinfo_post_GetCurrencyForeignPageList',this.msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = res.data.data.pageData; let data = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
...@@ -370,6 +373,7 @@ ...@@ -370,6 +373,7 @@
this.tips(res.data.message,'success'); this.tips(res.data.message,'success');
this.initTableInfo(); this.initTableInfo();
this.addShow =false this.addShow =false
this.loading = false
this.cancelEdit() this.cancelEdit()
this.resetForm('addMsg') this.resetForm('addMsg')
} else { } else {
...@@ -383,6 +387,7 @@ ...@@ -383,6 +387,7 @@
this.tips(res.data.message,'success'); this.tips(res.data.message,'success');
this.initTableInfo(); this.initTableInfo();
this.addShow =false this.addShow =false
this.loading = false
this.cancelEdit() this.cancelEdit()
this.resetForm('addMsg') this.resetForm('addMsg')
} else { } else {
...@@ -394,8 +399,8 @@ ...@@ -394,8 +399,8 @@
let that = this; let that = this;
that.$refs[addMsg].validate((valid) => { that.$refs[addMsg].validate((valid) => {
if (valid) { if (valid) {
if(!that.addShow){ if(!that.loading){
that.addShow = true that.loading = true
if(that.dialogTitle=='上调'){ if(that.dialogTitle=='上调'){
that.editFlightmodule() that.editFlightmodule()
}else{ }else{
......
src/components/systemManagement/ForeignCurrencyHL/historyHL.vue
View file @ 64ff185a
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<li> <li>
<span> <span>
<span> <span>
<em>本位币种</em> <em>本位币</em>
<el-select filterable v-model='msg.StandardCurrencyId' :placeholder="$t('rule.qxzbzhong')" class=" _border_b_1"> <el-select filterable v-model='msg.StandardCurrencyId' :placeholder="$t('rule.qxzbzhong')" class=" _border_b_1">
<el-option label='不限' value='-1' key='-1'></el-option> <el-option label='不限' value='-1' key='-1'></el-option>
<el-option v-for='item in coinGetList' <el-option v-for='item in coinGetList'
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<th>币种</th> <th>币种</th>
<th>本位币</th> <th>本位币</th>
<th>汇率</th> <th>汇率</th>
<th>上调汇率</th> <!-- <th>上调汇率</th> -->
</tr> </tr>
<tr v-for="(item,index) in tableInfo" :key="index"> <tr v-for="(item,index) in tableInfo" :key="index">
<td>{{item.CurrencyName}}</td> <td>{{item.CurrencyName}}</td>
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
<td > <td >
{{item.CurrentRate}} {{item.CurrentRate}}
</td> </td>
<td>{{item.ExchangeRates?item.ExchangeRates:'-'}}</td> <!-- <td>{{item.ExchangeRates?item.ExchangeRates:'-'}}</td> -->
</tr> </tr>
</table> </table>
<div class="noData" v-show="noData"> <div class="noData" v-show="noData">
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<ul class="clearfix" > <ul class="clearfix" >
<li> <li>
<el-form-item label="币种" prop="CurrencyId"> <el-form-item label="币种" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' placeholder="请选择币种" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1"> <el-select filterable v-model='addMsg.CurrencyId' placeholder="请选择币种" class=" _border_b_1">
<el-option v-for='item in coinGetList' <el-option v-for='item in coinGetList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -209,8 +209,8 @@ ...@@ -209,8 +209,8 @@
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="本位币种" prop="StandardCurrencyId"> <el-form-item label="本位币" prop="StandardCurrencyId">
<el-select filterable v-model='addMsg.StandardCurrencyId' placeholder="请选择本位币种" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1"> <el-select filterable v-model='addMsg.StandardCurrencyId' placeholder="请选择本位币" class=" _border_b_1">
<el-option v-for='item in coinGetList' <el-option v-for='item in coinGetList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</li> </li>
<li> <li>
<el-form-item label="汇率" prop="CurrentRate"> <el-form-item label="汇率" prop="CurrentRate">
<el-input-number class="w135" v-model="addMsg.CurrentRate" :min="0" @change="getRate"></el-input-number> <el-input v-model="addMsg.CurrentRate" @change="getRate"></el-input>
</el-form-item> </el-form-item>
</li> </li>
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
<div> <div>
<ul class="clearfix" style="text-align: right;"> <ul class="clearfix" style="text-align: right;">
<li class="_add_saveBtn" style="float: initial;" > <li class="_add_saveBtn" style="float: initial;" >
<button type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> <button v-loading="loading" type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
</li> </li>
</ul> </ul>
...@@ -275,6 +275,7 @@ ...@@ -275,6 +275,7 @@
total:0, total:0,
currentPage: 1, currentPage: 1,
loading2:true, loading2:true,
loading:false,
tableInfo:'', tableInfo:'',
addShow:false, addShow:false,
noData:false, noData:false,
...@@ -284,10 +285,11 @@ ...@@ -284,10 +285,11 @@
{ required: true, message: '请选择币种', trigger: 'change' } { required: true, message: '请选择币种', trigger: 'change' }
], ],
StandardCurrencyId: [ StandardCurrencyId: [
{ required: true, message: '请选择本位币种', trigger: 'change' } { required: true, message: '请选择本位币', trigger: 'change' }
], ],
CurrentRate:[ CurrentRate:[
{ required: true, message: '请输入汇率', trigger: 'blur' } { required: true, message: '请输入汇率', trigger: 'blur' },
{pattern: /^\d+$|^\d*\.\d+$/g, message: '请输入正确的汇率数'}
], ],
StartTime:[ StartTime:[
{ required: true, message: '请选择开始时间', trigger: 'change' } { required: true, message: '请选择开始时间', trigger: 'change' }
...@@ -316,7 +318,7 @@ ...@@ -316,7 +318,7 @@
}, },
methods: { methods: {
getRate(value){ getRate(value){
return this.moneyFormatB(value) this.addMsg.CurrentRate = this.moneyFormatB(value)
}, },
financeinfo_post_GetList(TCID){ // 获取币种 financeinfo_post_GetList(TCID){ // 获取币种
this.apipost('financeinfo_post_GetList', this.apipost('financeinfo_post_GetList',
...@@ -333,11 +335,12 @@ ...@@ -333,11 +335,12 @@
StartTime:'', StartTime:'',
EndTime:'', EndTime:'',
} }
this.addShow = false
}, },
initTableInfo(){ initTableInfo(){
this.tableInfo = []; this.tableInfo = [];
this.loading2 = true; this.loading2 = true;
this.apipost('financeinfo_post_GetCurrencyForeignPageList',this.msg, res => { this.apipost('financeinfo_post_GetCurrencyForeignHistoryPageList',this.msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = res.data.data.pageData; let data = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
...@@ -367,7 +370,7 @@ ...@@ -367,7 +370,7 @@
this.tips(res.data.message,'success'); this.tips(res.data.message,'success');
this.initTableInfo(); this.initTableInfo();
this.addShow =false this.addShow =false
this.ed =false this.loading = false
this.cancelEdit() this.cancelEdit()
this.resetForm('addMsg') this.resetForm('addMsg')
} else { } else {
...@@ -379,8 +382,8 @@ ...@@ -379,8 +382,8 @@
let that = this; let that = this;
that.$refs[addMsg].validate((valid) => { that.$refs[addMsg].validate((valid) => {
if (valid) { if (valid) {
if(!that.addShow){ if(!that.loading){
that.addShow = true that.loading = true
that.addFlightmodule() that.addFlightmodule()
} }
} else { } else {
......
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