Skip to content

S
SuperMan
Commit 93bbed0d authored by youjie's avatar youjie
Browse files
Options

no message

parent 0257abcd
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 34 deletions
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @ 93bbed0d
......@@ -93,6 +93,7 @@
}
.cm_content{
width: 100%;
height: 600px;
}
.BalanceBox{
......@@ -101,6 +102,22 @@
color: #f56c6c;
cursor: pointer;
}
.textnowrap{
white-space: nowrap;
}
.BalanceListBox{
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
width: 479px;
background: #fff;
z-index: 9999;
}
/deep/.page_CompanyAccDetail .el-table__row.hover-row .BalanceListBox{
background: #F5F7FA;
}
</style>
<template>
......@@ -149,7 +166,9 @@
<el-table ref="table" :data="SubjectList"
style="width: 100%;" height="600"
v-loading="loadingTable"
:span-method="objectSpanMethod">
:span-method="objectSpanMethod"
:header-cell-style="{ width: '200px' }"
:cell-style="{ width: '200px' }" >
<el-table-column prop="Name" label="" width="150" fixed="left" align="center">
<template #header>
<div class="headeBox">
......@@ -166,13 +185,14 @@
<template #header>
<div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
</template>
<el-table-column :label="String(item.StartBalance)" align="center">
<el-table-column prop="Income" :label="$t('objFill.v103.yinhangshouru')" min-width="120" align="center">
<el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center">
<el-table-column prop="" :label="$t('objFill.v103.yinhangshouru')" width="120" align="center">
<template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6">
<div>
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" class="textnowrap">
{{ scope.row.BalanceList[index].Income }}
</div>
<div v-else>
<div class="BalanceListBox" v-if="scope.row.SubjectId==-6">
<el-image v-if="scope.row.BalanceList[index].Image"
style="width: 20px; height: 20px;"
:src="scope.row.BalanceList[index].Image"
......@@ -181,27 +201,29 @@
fit="cover"
/>
</div>
<div v-if="scope.row.SubjectId==-5" class="BalanceListBox textnowrap">{{ scope.row.BalanceList[index].EndBalance }}</div>
</div>
</template>
</el-table-column>
<el-table-column prop="FinanceIncome" :label="$t('objFill.v103.danjusr')" min-width="120" align="center">
<el-table-column prop="" :label="$t('objFill.v103.danjusr')" width="120" align="center">
<template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6" @click="goUrl(scope.row,scope.row.BalanceList[index],1)"
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],1)"
class="BalanceBox"
:class="[scope.row.BalanceList[index].FinanceIncome?'active':'']">
{{ scope.row.BalanceList[index].FinanceIncome }}
</div>
</template>
</el-table-column>
<el-table-column prop="Expenses" :label="$t('objFill.v103.yinhangzhichu')" min-width="120" align="center">
<el-table-column prop="" :label="$t('objFill.v103.yinhangzhichu')" width="120" align="center">
<template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5">
{{ scope.row.BalanceList[index].Expenses }}
</div>
</template>
</el-table-column>
<el-table-column prop="FinanceExpenses" :label="$t('objFill.v103.danjuzc')" min-width="120" align="center">
<el-table-column prop="" :label="$t('objFill.v103.danjuzc')" width="120" align="center">
<template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6" @click="goUrl(scope.row,scope.row.BalanceList[index],2)"
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],2)"
class="BalanceBox"
:class="[scope.row.BalanceList[index].FinanceExpenses?'active':'']">
{{ scope.row.BalanceList[index].FinanceExpenses }}
......@@ -211,6 +233,7 @@
</el-table-column>
</el-table-column>
</template>
</el-table>
</div>
<SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList>
......@@ -270,10 +293,10 @@ export default {
}
},
created(){
let mon1= this.getBeforeDate(1, new Date().Format("yyyy-MM-dd"));
let mon2= this.getBeforeDate(7, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
// let mon1= this.getBeforeDate(12, new Date().Format("yyyy-MM-dd"));
// let mon2= this.getBeforeDate(16, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
// let mon1= this.getBeforeDate(1, new Date().Format("yyyy-MM-dd"));
// let mon2= this.getBeforeDate(7, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
let mon1= this.getBeforeDate(12, new Date().Format("yyyy-MM-dd"));
let mon2= this.getBeforeDate(16, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
this.titleStart = mon2.slice(5,7)>9?mon2.slice(5,7):mon2.slice(6,7)
this.titleEnd = mon1.slice(5,7)>9?mon1.slice(5,7):mon1.slice(6,7)
this.productionDate=[mon2,mon1];
......@@ -376,11 +399,15 @@ export default {
this.isShowAdd = false
},
objectSpanMethod(row) {
if (row.columnIndex !=0) {
if (row.rowIndex==this.SubjectList.length-1||row.rowIndex==this.SubjectList.length-2) {
return [1,4]
}
}
// console.log(row.columnIndex,'----',row.rowIndex)
// if (row.columnIndex !=0) {
// if (row.rowIndex==this.SubjectList.length-1) {
// return [1,4]
// }
// if(row.rowIndex==this.SubjectList.length-2) {
// return [1,4]
// }
// }
},
getList(){ //获取列表
if(this.loadingTable) return
......@@ -401,9 +428,11 @@ export default {
Image: obj.Image
})
}
setTimeout(()=>{
this.$nextTick(() => {
this.$refs.table.doLayout(); // 若表格有 ref="table"
});
},500)
}else{
this.Error(res.data.message)
if( this.msg.ClientID == 0 ){
......
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