Commit 5be2c95f authored by 黄媛媛's avatar 黄媛媛

update

parent de0517c9
......@@ -194,7 +194,11 @@
<td>
<span>{{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }}</span>
</td>
<td>{{ moneyFormat(allMoney) }}</td>
<td>
<span v-if="OutMoney == 0">0</span>
<span v-else>{{ moneyFormat(allMoney) }}</span>
</td>
</tr>
</table>
</div>
......@@ -586,14 +590,22 @@ export default {
OutMoney = 0;
data.forEach( ( x , i ) => {
if(x.Type==1){
if(x. IsPlatformMergeBank==1){
x.EndMoney = Money - x.Money;
Money = x.EndMoney;
OutMoney = OutMoney + x.Money;
}
// else{
x.EndMoney = Money + x.Money;
Money = x.EndMoney;
InMoney = InMoney + x.Money;
}else if(x.Type==2){
// }
}else{
x.EndMoney = Money - x.Money;
Money = x.EndMoney;
OutMoney = OutMoney + x.Money;
}
// if(x.Type==2)
});
this.allMoney = Money;
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