Skip to content

S
SuperMan
Commit 5be2c95f authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent de0517c9
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 6 deletions
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 5be2c95f
...@@ -193,8 +193,12 @@ ...@@ -193,8 +193,12 @@
<td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td> <td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td> <td>
<span>{{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }}</span> <span>{{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }}</span>
</td> </td>
<td>{{ moneyFormat(allMoney) }}</td> <td>
<span v-if="OutMoney == 0">0</span>
<span v-else>{{ moneyFormat(allMoney) }}</span>
</td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -586,14 +590,22 @@ export default { ...@@ -586,14 +590,22 @@ export default {
OutMoney = 0; OutMoney = 0;
data.forEach( ( x , i ) => { data.forEach( ( x , i ) => {
if(x.Type==1){ if(x.Type==1){
x.EndMoney = Money + x.Money; if(x. IsPlatformMergeBank==1){
Money = x.EndMoney; x.EndMoney = Money - x.Money;
InMoney = InMoney + x.Money; Money = x.EndMoney;
}else if(x.Type==2){ OutMoney = OutMoney + x.Money;
}
// else{
x.EndMoney = Money + x.Money;
Money = x.EndMoney;
InMoney = InMoney + x.Money;
// }
}else{
x.EndMoney = Money - x.Money; x.EndMoney = Money - x.Money;
Money = x.EndMoney; Money = x.EndMoney;
OutMoney = OutMoney + x.Money; OutMoney = OutMoney + x.Money;
} }
// if(x.Type==2)
}); });
this.allMoney = Money; this.allMoney = Money;
this.InMoney = InMoney; this.InMoney = InMoney;
......
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