Skip to content

S
SuperMan
Commit 35c11145 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents bf31cae6 22c17884
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 31 deletions
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @ 35c11145
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
} }
.cm_content{ .cm_content{
width: 100%; width: 100%;
height: 600px;
} }
.BalanceBox{ .BalanceBox{
...@@ -101,6 +102,22 @@ ...@@ -101,6 +102,22 @@
color: #f56c6c; color: #f56c6c;
cursor: pointer; cursor: pointer;
} }
.textnowrap{
white-space: nowrap;
}
.BalanceListBox{
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
width: 479px;
background: #fff;
z-index: 2;
}
/deep/.page_CompanyAccDetail .el-table__row.hover-row .BalanceListBox{
background: #F5F7FA;
}
</style> </style>
<template> <template>
...@@ -149,7 +166,9 @@ ...@@ -149,7 +166,9 @@
<el-table ref="table" :data="SubjectList" <el-table ref="table" :data="SubjectList"
style="width: 100%;" height="600" style="width: 100%;" height="600"
v-loading="loadingTable" 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"> <el-table-column prop="Name" label="" width="150" fixed="left" align="center">
<template #header> <template #header>
<div class="headeBox"> <div class="headeBox">
...@@ -163,45 +182,48 @@ ...@@ -163,45 +182,48 @@
<el-table-column v-for="(item,index) in DateList" <el-table-column v-for="(item,index) in DateList"
:key="index" :key="index"
align="center"> align="center">
<template #header> <template #header>
<div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div> <div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
</template> </template>
<el-table-column :label="String(item.StartBalance)" align="center"> <el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center">
<el-table-column prop="Income" :label="$t('objFill.v103.yinhangshouru')" min-width="120" align="center"> <el-table-column prop="" :label="$t('objFill.v103.yinhangshouru')" width="120" align="center">
<template slot-scope="scope"> <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 }} {{ scope.row.BalanceList[index].Income }}
</div> </div>
<div v-else> <div class="BalanceListBox" v-if="scope.row.SubjectId==-6">
<el-image v-if="scope.row.BalanceList[index].Image" <el-image v-if="scope.row.BalanceList[index].Image"
style="width: 20px; height: 20px;" style="width: 20px; height: 20px;"
:src="scope.row.BalanceList[index].Image" :src="scope.row.BalanceList[index].Image"
:preview-src-list="[scope.row.BalanceList[index].Image]" :preview-src-list="[scope.row.BalanceList[index].Image]"
show-progress show-progress
fit="cover" fit="cover"
/> />
</div>
<div v-if="scope.row.SubjectId==-5" class="BalanceListBox textnowrap">{{ scope.row.BalanceList[index].EndBalance }}</div>
</div> </div>
</template> </template>
</el-table-column> </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"> <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="BalanceBox"
:class="[scope.row.BalanceList[index].FinanceIncome?'active':'']"> :class="[scope.row.BalanceList[index].FinanceIncome?'active':'']">
{{ scope.row.BalanceList[index].FinanceIncome }} {{ scope.row.BalanceList[index].FinanceIncome }}
</div> </div>
</template> </template>
</el-table-column> </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"> <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 }} {{ scope.row.BalanceList[index].Expenses }}
</div> </div>
</template> </template>
</el-table-column> </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"> <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="BalanceBox"
:class="[scope.row.BalanceList[index].FinanceExpenses?'active':'']"> :class="[scope.row.BalanceList[index].FinanceExpenses?'active':'']">
{{ scope.row.BalanceList[index].FinanceExpenses }} {{ scope.row.BalanceList[index].FinanceExpenses }}
...@@ -211,6 +233,7 @@ ...@@ -211,6 +233,7 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</template> </template>
</el-table> </el-table>
</div> </div>
<SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList> <SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList>
...@@ -270,10 +293,10 @@ export default { ...@@ -270,10 +293,10 @@ export default {
} }
}, },
created(){ created(){
let mon1= this.getBeforeDate(1, 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 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 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 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.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.titleEnd = mon1.slice(5,7)>9?mon1.slice(5,7):mon1.slice(6,7)
this.productionDate=[mon2,mon1]; this.productionDate=[mon2,mon1];
...@@ -376,11 +399,15 @@ export default { ...@@ -376,11 +399,15 @@ export default {
this.isShowAdd = false this.isShowAdd = false
}, },
objectSpanMethod(row) { objectSpanMethod(row) {
if (row.columnIndex !=0) { // console.log(row.columnIndex,'----',row.rowIndex)
if (row.rowIndex==this.SubjectList.length-1||row.rowIndex==this.SubjectList.length-2) { // if (row.columnIndex !=0) {
return [1,4] // if (row.rowIndex==this.SubjectList.length-1) {
} // return [1,4]
} // }
// if(row.rowIndex==this.SubjectList.length-2) {
// return [1,4]
// }
// }
}, },
getList(){ //获取列表 getList(){ //获取列表
if(this.loadingTable) return if(this.loadingTable) return
......
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