Skip to content

S
SuperMan
Commit 7bd82f00 authored by youjie's avatar youjie
Browse files
Options

修复bug

parent 4dbbc8f0
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
src/components/FinancialModule/RecPayQueryWB.vue
View file @ 7bd82f00
......@@ -603,7 +603,7 @@ Vue.component('table-CostType',{ //费用类型
template:`
<table>
<tr style="text-align: center">
<th">{{$t('fnc.fyshuoming')}}</th>
<th>{{$t('fnc.fyshuoming')}}</th>
<th>数量</th>
<th>单价</th>
<th>币种</th>
......
src/components/FinancialModule/paySetting.vue
View file @ 7bd82f00
......@@ -4,7 +4,7 @@
._scrollbar::-webkit-scrollbar-track{box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;}
.page_paySetting ._edHeight{height:430px;}
.page_paySetting .edHeight{display: block !important;height: 290px;}
.page_paySetting ._vMG_edit{overflow: auto;display: none;position:absolute;bottom:0;left: 0;font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#FFFFFF;padding:10px;width: 100%;}
.page_paySetting ._vMG_edit{overflow: auto;display: none;position:absolute;bottom:0;left: 0;font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#FFFFFF;padding:10px;width: 100%;}
.page_paySetting ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000}
.page_paySetting ._vMG_edit ._tit span{color: #666666}
.page_paySetting ._vMG_edit form{padding: 25px 0}
......@@ -75,7 +75,7 @@
<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>
</el-tooltip>
</li>
</ul>
</div>
......@@ -85,11 +85,11 @@
<div class="clearfix">
<el-tooltip class="item" effect="dark" :content="item.Mch_Id" placement="top-end">
<p class="over_ellipsis ps_num PingFangSC">{{item.Mch_Id}}</p>
</el-tooltip>
</el-tooltip>
<p class="ps_btn">
<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>
</p>
</div>
<div class="ps_com">
<p>{{$t('system.query_company')}}：</p>
......@@ -117,12 +117,12 @@
<th>{{$t('fnc.zhanghuleixing')}}</th>
<!-- <th>账户分类</th> -->
<!-- <th>账户</th>
<th">{{$t('system.query_company')}}</th> -->
<th>{{$t('system.query_company')}}</th> -->
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Mch_Id}}</td>
<td>{{item.Req_URL}}</td>
<td>{{item.Req_URL}}</td>
<!-- <td>{{item.ClientName}}</td> -->
<td>{{item.AccountType}}</td>
<!-- <td>{{item.ClientName}}</td>
......@@ -144,9 +144,9 @@
{{$t('system.content_noData')}}
</div>
<div>
<el-pagination
<el-pagination
background
@current-change="handleCurrentChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
......@@ -179,16 +179,16 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row>
<el-col :span="6" :gutter="35">
<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>
<el-col :span="6">
<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'
<el-option v-for='item in AccList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
......@@ -199,7 +199,7 @@
<el-col :span="6">
<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'
<el-option v-for='item in GetAccountType'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
......@@ -210,7 +210,7 @@
<el-col :span="6">
<el-form-item :label="$t('fnc.acc')+'：'" prop="BankID">
<el-select filterable v-model='addMsg.BankID'>
<el-option v-for='item in accountList'
<el-option v-for='item in accountList'
:label='item.allName'
:value='item.ID'
:key='item.ID'>
......@@ -242,7 +242,7 @@
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
......@@ -251,7 +251,7 @@ export default {
return{
noData:false,
addShow:false,
total:0,
total:0,
currentPage:1,
dataList:[],
text:'',
......@@ -317,7 +317,7 @@ export default {
tableSize:0,
blockSize:0,
}
},created(){
},created(){
let allH,allW,cH,cW;
allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth;
......@@ -385,7 +385,7 @@ export default {
getAccountList(i,o){ //获取账户类型对应下的账户列表
if(o==1){
this.addMsg.BankID = '';
}
}
if(this.addMsg.AccountType){
if(i==1){
this.bankaccount_post_GetList()
......@@ -398,10 +398,10 @@ export default {
}
if(i==4){
this.BankAccount_post_GetCashPoolList()
}
}
}else{
return this.$message.success(this.$t('tips.qxzzhleixing'))
}
}
},
BankAccount_post_GetPlatformList(i){ //获取平台账户
let msg = {
......@@ -410,7 +410,7 @@ export default {
BranchId:-1,
Alias:'',
RB_Branch_Id:this.RB_Branch_Id,
}
}
this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
......@@ -419,7 +419,7 @@ export default {
x.Name = x.Alias;
})
this.accountList = data;
}
}, err => {})
},
......@@ -428,7 +428,7 @@ export default {
TypeId:this.addMsg.AccountType,
BranchId:-1,
Alias:'',
RB_Branch_Id:this.RB_Branch_Id,
RB_Branch_Id:this.RB_Branch_Id,
};
this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
if(res.data.resultCode == 1) {
......@@ -468,7 +468,7 @@ export default {
BankAccount_post_GetAccountType(){ //获取账户类型列表
this.apipost('BankAccount_post_GetAccountType',{}, res => {
if(res.data.resultCode == 1) {
this.GetAccountType = res.data.data;
this.GetAccountType = res.data.data;
}
}, err => {})
},
......@@ -514,13 +514,13 @@ export default {
}else{
this.$message.error(res.data.message);
}
}, err => {})
}, err => {})
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('hotel.hotel_HasBeenCancelled')
});
});
});
},
submitForm(addMsg) {//提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
......@@ -599,7 +599,7 @@ export default {
list.push(cp)
}
})
let allArr = list2.concat(list); // 数组合并
let allArr = list2.concat(list); // 数组合并
var obj = {};
allArr = allArr.reduce(function(item, next) { //数组对象去重
obj[next.Branch_Id] ? '' : obj[next.Branch_Id] = true && item.push(next);
......@@ -638,7 +638,7 @@ export default {
}else{
this.$message.error(res.data.message);
}
}, err => {})
}, err => {})
},
getList() { //获取列表数据
this.dataList = [];
......@@ -661,7 +661,7 @@ export default {
}
this.loading = false;
}
}, err => {this.loading =false;})
}, err => {this.loading =false;})
},
resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 7bd82f00
......@@ -1006,7 +1006,7 @@
</tr>
<tr>
<th>{{$t('fnc.danhao')}}</th>
<th">{{$t('system.query_company')}}</th>
<th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.djleixing')}}</th>
<th>{{$t('fnc.feiyongleixing')}}</th>
<th>{{$t('tips.jiaoyifangshi')}}</th>
......
src/components/Ticketing/TicketAmiba.vue
View file @ 7bd82f00
......@@ -118,7 +118,7 @@
<tr>
<th><input v-model="isCkedAll" type="checkbox" @click='checkedAll()' /></th>
<th>{{$t('fnc.danhao')}}</th>
<th">{{$t('system.query_company')}}</th>
<th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.djleixing')}}</th>
<th>{{$t('fnc.feiyongleixing')}}</th>
<th>{{$t('tips.jiaoyifangshi')}}</th>
......@@ -146,7 +146,7 @@
</td>
<td>{{item.RemitterName}}</td>
<td>{{item.EmName}}</td>
</tr>
</table>
</el-form>
......
src/components/administrative/Diplomaticplat.vue
View file @ 7bd82f00
......@@ -106,7 +106,7 @@
<th>{{$t('restaurant.res_ContactNumber')}}</th>
<th>是否有合同</th>
<th>合同说明</th>
<th">{{$t('system.query_company')}}</th>
<th>{{$t('system.query_company')}}</th>
<th width="500">{{$t('pub.pubRemark')}}</th>
<!-- <th>图片</th> -->
<th>操作人</th>
......
src/components/leaderPay2.vue
View file @ 7bd82f00
......@@ -683,7 +683,7 @@
</tr>
<tr>
<th>{{$t('fnc.danhao')}}</th>
<th">{{$t('system.query_company')}}</th>
<th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.djleixing')}}</th>
<th>{{$t('fnc.feiyongleixing')}}</th>
<th>{{$t('tips.jiaoyifangshi')}}</th>
......@@ -978,7 +978,7 @@
<tr>
<th width="140">序号</th>
<th>{{$t('fnc.danhao')}}</th>
<th">{{$t('fnc.fyshuoming')}}</th>
<th>{{$t('fnc.fyshuoming')}}</th>
<th>日期</th>
<th>{{$t('pub.pubRemark')}}</th>
<th>应付/应收金额</th>
......
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