Commit 7bd82f00 authored by youjie's avatar youjie

修复bug

parent 4dbbc8f0
...@@ -603,7 +603,7 @@ Vue.component('table-CostType',{ //费用类型 ...@@ -603,7 +603,7 @@ Vue.component('table-CostType',{ //费用类型
template:` template:`
<table> <table>
<tr style="text-align: center"> <tr style="text-align: center">
<th">{{$t('fnc.fyshuoming')}}</th> <th>{{$t('fnc.fyshuoming')}}</th>
<th>数量</th> <th>数量</th>
<th>单价</th> <th>单价</th>
<th>币种</th> <th>币种</th>
......
...@@ -4,7 +4,7 @@ ...@@ -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;} ._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{height:430px;}
.page_paySetting .edHeight{display: block !important;height: 290px;} .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{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 ._tit span{color: #666666}
.page_paySetting ._vMG_edit form{padding: 25px 0} .page_paySetting ._vMG_edit form{padding: 25px 0}
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" 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="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i> <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
</el-tooltip> </el-tooltip>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -85,11 +85,11 @@ ...@@ -85,11 +85,11 @@
<div class="clearfix"> <div class="clearfix">
<el-tooltip class="item" effect="dark" :content="item.Mch_Id" placement="top-end"> <el-tooltip class="item" effect="dark" :content="item.Mch_Id" placement="top-end">
<p class="over_ellipsis ps_num PingFangSC">{{item.Mch_Id}}</p> <p class="over_ellipsis ps_num PingFangSC">{{item.Mch_Id}}</p>
</el-tooltip> </el-tooltip>
<p class="ps_btn"> <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-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> <i class="iconfont icon-img_delete_small" @click="deletePay(item.ID,item.Mch_Id)"></i>
</p> </p>
</div> </div>
<div class="ps_com"> <div class="ps_com">
<p>{{$t('system.query_company')}}</p> <p>{{$t('system.query_company')}}</p>
...@@ -117,12 +117,12 @@ ...@@ -117,12 +117,12 @@
<th>{{$t('fnc.zhanghuleixing')}}</th> <th>{{$t('fnc.zhanghuleixing')}}</th>
<!-- <th>账户分类</th> --> <!-- <th>账户分类</th> -->
<!-- <th>账户</th> <!-- <th>账户</th>
<th">{{$t('system.query_company')}}</th> --> <th>{{$t('system.query_company')}}</th> -->
<th>{{$t('system.table_operation')}}</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item,index) in dataList" :key="index"> <tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Mch_Id}}</td> <td>{{item.Mch_Id}}</td>
<td>{{item.Req_URL}}</td> <td>{{item.Req_URL}}</td>
<!-- <td>{{item.ClientName}}</td> --> <!-- <td>{{item.ClientName}}</td> -->
<td>{{item.AccountType}}</td> <td>{{item.AccountType}}</td>
<!-- <td>{{item.ClientName}}</td> <!-- <td>{{item.ClientName}}</td>
...@@ -144,9 +144,9 @@ ...@@ -144,9 +144,9 @@
{{$t('system.content_noData')}} {{$t('system.content_noData')}}
</div> </div>
<div> <div>
<el-pagination <el-pagination
background background
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :page-size=msg.pageSize
...@@ -179,16 +179,16 @@ ...@@ -179,16 +179,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6" :gutter="35"> <el-col :span="6" :gutter="35">
<el-form-item :label="$t('fnc.banbenhao')+':'" prop="Version"> <el-form-item :label="$t('fnc.banbenhao')+':'" prop="Version">
<el-input v-model="addMsg.Version" class="" ></el-input> <el-input v-model="addMsg.Version" class="" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('fnc.zhanghuleixing')+':'" prop="AccountType" > <el-form-item :label="$t('fnc.zhanghuleixing')+':'" prop="AccountType" >
<el-select filterable v-model='addMsg.AccountType' @change="claerAcc()"> <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' :label='item.Name'
:value='item.ID' :value='item.ID'
:key='item.ID'> :key='item.ID'>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('fnc.zhfenlei')+':'" prop="BankType"> <el-form-item :label="$t('fnc.zhfenlei')+':'" prop="BankType">
<el-select filterable v-model='addMsg.BankType' @change="getAccountList(addMsg.BankType,1)"> <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' :label='item.Name'
:value='item.ID' :value='item.ID'
:key='item.ID'> :key='item.ID'>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('fnc.acc')+':'" prop="BankID"> <el-form-item :label="$t('fnc.acc')+':'" prop="BankID">
<el-select filterable v-model='addMsg.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' :label='item.allName'
:value='item.ID' :value='item.ID'
:key='item.ID'> :key='item.ID'>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -251,7 +251,7 @@ export default { ...@@ -251,7 +251,7 @@ export default {
return{ return{
noData:false, noData:false,
addShow:false, addShow:false,
total:0, total:0,
currentPage:1, currentPage:1,
dataList:[], dataList:[],
text:'', text:'',
...@@ -317,7 +317,7 @@ export default { ...@@ -317,7 +317,7 @@ export default {
tableSize:0, tableSize:0,
blockSize:0, blockSize:0,
} }
},created(){ },created(){
let allH,allW,cH,cW; let allH,allW,cH,cW;
allH = document.documentElement.clientHeight; allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth; allW = document.documentElement.clientWidth;
...@@ -385,7 +385,7 @@ export default { ...@@ -385,7 +385,7 @@ export default {
getAccountList(i,o){ //获取账户类型对应下的账户列表 getAccountList(i,o){ //获取账户类型对应下的账户列表
if(o==1){ if(o==1){
this.addMsg.BankID = ''; this.addMsg.BankID = '';
} }
if(this.addMsg.AccountType){ if(this.addMsg.AccountType){
if(i==1){ if(i==1){
this.bankaccount_post_GetList() this.bankaccount_post_GetList()
...@@ -398,10 +398,10 @@ export default { ...@@ -398,10 +398,10 @@ export default {
} }
if(i==4){ if(i==4){
this.BankAccount_post_GetCashPoolList() this.BankAccount_post_GetCashPoolList()
} }
}else{ }else{
return this.$message.success(this.$t('tips.qxzzhleixing')) return this.$message.success(this.$t('tips.qxzzhleixing'))
} }
}, },
BankAccount_post_GetPlatformList(i){ //获取平台账户 BankAccount_post_GetPlatformList(i){ //获取平台账户
let msg = { let msg = {
...@@ -410,7 +410,7 @@ export default { ...@@ -410,7 +410,7 @@ export default {
BranchId:-1, BranchId:-1,
Alias:'', Alias:'',
RB_Branch_Id:this.RB_Branch_Id, RB_Branch_Id:this.RB_Branch_Id,
} }
this.apipost('BankAccount_post_GetPlatformList',msg, res => { this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
...@@ -419,7 +419,7 @@ export default { ...@@ -419,7 +419,7 @@ export default {
x.Name = x.Alias; x.Name = x.Alias;
}) })
this.accountList = data; this.accountList = data;
} }
}, err => {}) }, err => {})
}, },
...@@ -428,7 +428,7 @@ export default { ...@@ -428,7 +428,7 @@ export default {
TypeId:this.addMsg.AccountType, TypeId:this.addMsg.AccountType,
BranchId:-1, BranchId:-1,
Alias:'', Alias:'',
RB_Branch_Id:this.RB_Branch_Id, RB_Branch_Id:this.RB_Branch_Id,
}; };
this.apipost('BankAccount_post_GetCashAccountList',msg, res => { this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
...@@ -468,7 +468,7 @@ export default { ...@@ -468,7 +468,7 @@ export default {
BankAccount_post_GetAccountType(){ //获取账户类型列表 BankAccount_post_GetAccountType(){ //获取账户类型列表
this.apipost('BankAccount_post_GetAccountType',{}, res => { this.apipost('BankAccount_post_GetAccountType',{}, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.GetAccountType = res.data.data; this.GetAccountType = res.data.data;
} }
}, err => {}) }, err => {})
}, },
...@@ -514,13 +514,13 @@ export default { ...@@ -514,13 +514,13 @@ export default {
}else{ }else{
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, err => {}) }, err => {})
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: this.$t('hotel.hotel_HasBeenCancelled') message: this.$t('hotel.hotel_HasBeenCancelled')
}); });
}); });
}, },
submitForm(addMsg) {//提交创建、修改表单 submitForm(addMsg) {//提交创建、修改表单
this.$refs[addMsg].validate((valid) => { this.$refs[addMsg].validate((valid) => {
...@@ -599,7 +599,7 @@ export default { ...@@ -599,7 +599,7 @@ export default {
list.push(cp) list.push(cp)
} }
}) })
let allArr = list2.concat(list); // 数组合并 let allArr = list2.concat(list); // 数组合并
var obj = {}; var obj = {};
allArr = allArr.reduce(function(item, next) { //数组对象去重 allArr = allArr.reduce(function(item, next) { //数组对象去重
obj[next.Branch_Id] ? '' : obj[next.Branch_Id] = true && item.push(next); obj[next.Branch_Id] ? '' : obj[next.Branch_Id] = true && item.push(next);
...@@ -638,7 +638,7 @@ export default { ...@@ -638,7 +638,7 @@ export default {
}else{ }else{
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, err => {}) }, err => {})
}, },
getList() { //获取列表数据 getList() { //获取列表数据
this.dataList = []; this.dataList = [];
...@@ -661,7 +661,7 @@ export default { ...@@ -661,7 +661,7 @@ export default {
} }
this.loading = false; this.loading = false;
} }
}, err => {this.loading =false;}) }, err => {this.loading =false;})
}, },
resetPageIndex() {//查询初始化页码 resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
......
...@@ -1006,7 +1006,7 @@ ...@@ -1006,7 +1006,7 @@
</tr> </tr>
<tr> <tr>
<th>{{$t('fnc.danhao')}}</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.djleixing')}}</th>
<th>{{$t('fnc.feiyongleixing')}}</th> <th>{{$t('fnc.feiyongleixing')}}</th>
<th>{{$t('tips.jiaoyifangshi')}}</th> <th>{{$t('tips.jiaoyifangshi')}}</th>
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<tr> <tr>
<th><input v-model="isCkedAll" type="checkbox" @click='checkedAll()' /></th> <th><input v-model="isCkedAll" type="checkbox" @click='checkedAll()' /></th>
<th>{{$t('fnc.danhao')}}</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.djleixing')}}</th>
<th>{{$t('fnc.feiyongleixing')}}</th> <th>{{$t('fnc.feiyongleixing')}}</th>
<th>{{$t('tips.jiaoyifangshi')}}</th> <th>{{$t('tips.jiaoyifangshi')}}</th>
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
</td> </td>
<td>{{item.RemitterName}}</td> <td>{{item.RemitterName}}</td>
<td>{{item.EmName}}</td> <td>{{item.EmName}}</td>
</tr> </tr>
</table> </table>
</el-form> </el-form>
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<th>{{$t('restaurant.res_ContactNumber')}}</th> <th>{{$t('restaurant.res_ContactNumber')}}</th>
<th>是否有合同</th> <th>是否有合同</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 width="500">{{$t('pub.pubRemark')}}</th>
<!-- <th>图片</th> --> <!-- <th>图片</th> -->
<th>操作人</th> <th>操作人</th>
......
...@@ -683,7 +683,7 @@ ...@@ -683,7 +683,7 @@
</tr> </tr>
<tr> <tr>
<th>{{$t('fnc.danhao')}}</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.djleixing')}}</th>
<th>{{$t('fnc.feiyongleixing')}}</th> <th>{{$t('fnc.feiyongleixing')}}</th>
<th>{{$t('tips.jiaoyifangshi')}}</th> <th>{{$t('tips.jiaoyifangshi')}}</th>
...@@ -978,7 +978,7 @@ ...@@ -978,7 +978,7 @@
<tr> <tr>
<th width="140">序号</th> <th width="140">序号</th>
<th>{{$t('fnc.danhao')}}</th> <th>{{$t('fnc.danhao')}}</th>
<th">{{$t('fnc.fyshuoming')}}</th> <th>{{$t('fnc.fyshuoming')}}</th>
<th>日期</th> <th>日期</th>
<th>{{$t('pub.pubRemark')}}</th> <th>{{$t('pub.pubRemark')}}</th>
<th>应付/应收金额</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