Commit 4c1df684 authored by youjie's avatar youjie

no message

parent 6f561e29
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
<li v-for="(item,index) in NewItems"> <li v-for="(item,index) in NewItems">
<template v-if="(item.IsShow === 1 || item.showYes) && item.bigShow"> <template v-if="(item.IsShow === 1 || item.showYes) && item.bigShow">
<div class="_left"> <div class="_left">
{{item.Id}}
<span class="_Icon">{{item.Name.substring(0,1)}}</span> <span class="_Icon">{{item.Name.substring(0,1)}}</span>
<div> <div>
<p class="_t">{{item.Name}}</p> <p class="_t">{{item.Name}}</p>
...@@ -387,7 +386,7 @@ ...@@ -387,7 +386,7 @@
// noTypeCost 不是leaderReimbursement制单排除流程 // noTypeCost 不是leaderReimbursement制单排除流程
if(this.$route.query.noTypeCost){ if(this.$route.query.noTypeCost){
if(x.Id!=94&&x.Id!=95&&x.Id!=96&&x.Id!=97&&x.Id!=51&&x.Id!=52&&x.Id!=54&& if(x.Id!=94&&x.Id!=95&&x.Id!=96&&x.Id!=97&&x.Id!=51&&x.Id!=52&&x.Id!=54&&
x.Id!=55&&x.Id!=49&&x.Id!=50&&x.Id!=57&&x.Id!=88&&x.Id!=89){ x.Id!=55&&x.Id!=49&&x.Id!=50&&x.Id!=57&&x.Id!=58&&x.Id!=88&&x.Id!=89){
this.payList.push(x); this.payList.push(x);
} }
} }
......
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
</td> </td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; "> <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
<template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''"> <template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
{{subItem.HotelName}} <span style="text-decoration:line-through"> {{subItem.HotelName}}</span>
</template> </template>
<template v-else> <template v-else>
{{subItem.HotelName}} {{subItem.HotelName}}
...@@ -563,7 +563,7 @@ ...@@ -563,7 +563,7 @@
</td> </td>
<td style="text-align:left; "> <td style="text-align:left; ">
<template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''"> <template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
{{subItem.HotelName}} <span style="text-decoration:line-through"> {{subItem.HotelName}}</span>
</template> </template>
<template v-else> <template v-else>
{{subItem.HotelName}} {{subItem.HotelName}}
...@@ -1049,7 +1049,7 @@ ...@@ -1049,7 +1049,7 @@
<th width="10%">费用说明</th> <th width="10%">费用说明</th>
<th width="10%">日期</th> <th width="10%">日期</th>
<th width="20%">备注</th> <th width="20%">备注</th>
<th width="10%">应付/付金额</th> <th width="10%">应付/付金额</th>
<th width="10%">制单人</th> <th width="10%">制单人</th>
<th width="10%">状态</th> <th width="10%">状态</th>
</tr> </tr>
...@@ -1072,7 +1072,7 @@ ...@@ -1072,7 +1072,7 @@
</div> </div>
</td> </td>
<td> <td>
<span>¥{{moneyFormat(item.Money)}}</br>¥{{moneyFormat(item.WBMoney)}}</span> <span>应付:{{moneyFormat(item.Money)}}</br>实付:{{moneyFormat(item.PayMoney)}}</span>
</td> </td>
<td>{{item.EmName}}</td> <td>{{item.EmName}}</td>
<td>{{item.StatusStr}}</td> <td>{{item.StatusStr}}</td>
...@@ -1081,16 +1081,13 @@ ...@@ -1081,16 +1081,13 @@
<td>总金额</td> <td>总金额</td>
<td colspan="15"> <td colspan="15">
<span> <span>
{{getTotalMoney(otherList)}} <span> (人民币) </span> {{getTotalMoney(otherList)}} <span></span>
</span> </span>
</td> </td>
</tr> </tr>
</table> </table>
<p class="teamRevenueExpenditureTitle"> <p class="teamRevenueExpenditureTitle">
挂账 挂账
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" />
</span>
</p> </p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
...@@ -2303,11 +2300,7 @@ ...@@ -2303,11 +2300,7 @@
getTotalMoney(obj) { getTotalMoney(obj) {
let money = 0 let money = 0
obj.forEach(item => { obj.forEach(item => {
if (item.Type == 1) {
money += item.Money money += item.Money
} else {
money -= item.Money
}
}) })
if (obj.length > 0) { if (obj.length > 0) {
switch (obj[0].OrderSource) { switch (obj[0].OrderSource) {
......
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