Commit a1db8f15 authored by 沈良进's avatar 沈良进

save

parents cd265c70 e1676ba1
...@@ -359,10 +359,10 @@ ...@@ -359,10 +359,10 @@
{{getDayXiaoJi(7,1)}} {{getDayXiaoJi(7,1)}}
</td> </td>
<td> <td>
{{childItem.PeopleNumber}} {{childItem.PeopleNumber}}
</td> </td>
<td> <td>
{{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(childItem.PeopleNumber)).toFixed(0)}} <!-- {{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(childItem.PeopleNumber)).toFixed(0)}} -->
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,1)}} {{getDayXiaoJi(3,1)}}
...@@ -400,10 +400,15 @@ ...@@ -400,10 +400,15 @@
{{getDayXiaoJi(7,2)}} {{getDayXiaoJi(7,2)}}
</td> </td>
<td> <td>
{{childItem.PeopleNumber}} {{childItem.PeopleNumber}}
</td> </td>
<td> <td>
{{((Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(childItem.PeopleNumber)).toFixed(0)}} <!-- <el-tooltip class="item" effect="dark" content="mei" placement="top-start">
<span style="color:red">
{{((Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(childItem.PeopleNumber)).toFixed(0)}}</span>
</el-tooltip>
-->
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
...@@ -524,13 +529,13 @@ ...@@ -524,13 +529,13 @@
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}} {{CostNumberList[0].PeopleNumber}}
</template> </template>
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <!-- <template v-if="CostNumberList&&CostNumberList.length>0">
{{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}} {{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template> </template> -->
</td> </td>
<td> <td>
{{getDayXiaoJi(3,1)}} {{getDayXiaoJi(3,1)}}
...@@ -566,13 +571,13 @@ ...@@ -566,13 +571,13 @@
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}} {{CostNumberList[0].PeopleNumber}}
</template> </template>
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <!-- <template v-if="CostNumberList&&CostNumberList.length>0">
{{( (Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}} {{( (Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template> </template> -->
</td> </td>
<td> <td>
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
...@@ -1104,7 +1109,7 @@ ...@@ -1104,7 +1109,7 @@
</el-input> </el-input>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2">附件</td> <td class="CP_ComTitle2">附件</td>
<td colspan="13"> <td colspan="13">
...@@ -1699,6 +1704,8 @@ ...@@ -1699,6 +1704,8 @@
//其他价格 //其他价格
var otherPrice = Number(that.getCostTotalMoney()); var otherPrice = Number(that.getCostTotalMoney());
var jpyotherPrice = Number(that.getCostJpyTotalMoney()); var jpyotherPrice = Number(that.getCostJpyTotalMoney());
console.log("trip", trip)
console.log("otherPrice", otherPrice)
x.TotalMoney = (trip + otherPrice + x.TotalMoney = (trip + otherPrice +
Number(that.getConvertMoney(x.SubtotalMoney)) Number(that.getConvertMoney(x.SubtotalMoney))
).toFixed(0); ).toFixed(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