Skip to content

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

1

parent 827b6b43
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 91 deletions
src/components/SalesModule/enrollTotal.vue
View file @ b04570d9
...@@ -446,8 +446,8 @@ ...@@ -446,8 +446,8 @@
}}{{ $t("salesModule.PeoPle") }}) }}{{ $t("salesModule.PeoPle") }})
</span> </span>
</td> </td>
<td style="color: #ff9c00">{{ item.tC_Price }}</td> <td style="color: #ff9c00">{{ moneyFormatN(item.tC_Price) }}</td>
<td style="color: #ff9c00">￥{{ item.unit_Price }}</td> <td style="color: #ff9c00">￥{{ moneyFormatN(item.unit_Price) }}</td>
<td> <td>
<p style="color: #ff9c00;cursor: pointer;"> <p style="color: #ff9c00;cursor: pointer;">
<!-- ￥{{ item.preferPrice }} --> <!-- ￥{{ item.preferPrice }} -->
...@@ -457,9 +457,9 @@ ...@@ -457,9 +457,9 @@
<td> <td>
<span v-if="item.dueInMoney == 0" style="cursor: pointer">{{ <span v-if="item.dueInMoney == 0" style="cursor: pointer">{{
item.income moneyFormatN(item.income)
}}</span> }}</span>
<span v-if="item.dueInMoney != 0" style="cursor: pointer; color: #e95252">{{ item.income }}</span> <span v-if="item.dueInMoney != 0" style="cursor: pointer; color: #e95252">{{ moneyFormatN(item.income) }}</span>
</td> </td>
<!-- 优惠 --> <!-- 优惠 -->
<td> <td>
...@@ -509,7 +509,7 @@ ...@@ -509,7 +509,7 @@
cursor: pointer; cursor: pointer;
color: #e95252; color: #e95252;
text-decoration: underline; text-decoration: underline;
" slot="reference">{{ moneyFormat(item.discountMoney) }}</span> " slot="reference">{{ moneyFormatN(item.discountMoney) }}</span>
</el-popover> </el-popover>
</td> </td>
<td> <td>
...@@ -547,22 +547,22 @@ ...@@ -547,22 +547,22 @@
cursor: pointer; cursor: pointer;
color: #e95252; color: #e95252;
text-decoration: underline; text-decoration: underline;
" slot="reference">{{ item.redEnvelopeMoney }}</span> " slot="reference">{{ moneyFormatN(item.redEnvelopeMoney) }}</span>
</el-popover> </el-popover>
<span v-else style="color: #e95252; text-decoration: underline">{{ <span v-else style="color: #e95252; text-decoration: underline">{{
item.redEnvelopeMoney moneyFormatN(item.redEnvelopeMoney)
}}</span> }}</span>
</td> </td>
<td style="color: #ff9c00">{{ item.preferTipAmount }}</td> <td style="color: #ff9c00">{{ item.preferTipAmount }}</td>
<td v-if="item.tipMoney">{{ item.tipMoney }}</td> <td v-if="item.tipMoney">{{ item.tipMoney }}</td>
<td v-else>0.00</td> <td v-else>0</td>
<td>{{ item.refund }}</td> <td>{{ moneyFormatN(item.refund) }}</td>
<td>{{ item.platformTax }}</td> <td>{{ moneyFormatN(item.platformTax) }}</td>
<td>{{ item.zaiTuMoney }}</td> <td>{{ moneyFormatN(item.zaiTuMoney) }}</td>
<td>{{ item.cashReceiptsMoney }}</td> <td>{{ moneyFormatN(item.cashReceiptsMoney) }}</td>
<td> <td>
<span :class="{ color_red_order: item.dueInMoney !== item.preferPrice }">{{ item.dueInMoney }}</span> <span :class="{ color_red_order: item.dueInMoney !== item.preferPrice }">{{ moneyFormatN(item.dueInMoney) }}</span>
</td> </td>
<td v-if="item.isChargeLossOrders == 1" class="fz12" style="color: #e95252"> <td v-if="item.isChargeLossOrders == 1" class="fz12" style="color: #e95252">
{{ $t("fnc.shousun") }} {{ $t("fnc.shousun") }}
......
src/components/SalesModule/groupTourOrder.vue
View file @ b04570d9
...@@ -1791,8 +1791,8 @@ ...@@ -1791,8 +1791,8 @@
}}{{ $t("sm.person") }}) }}{{ $t("sm.person") }})
</span> </span>
</td> </td>
<td style="color: #ff9c00">{{ item.tC_Price }}</td> <td style="color: #ff9c00">{{ moneyFormatN(item.tC_Price) }}</td>
<td style="color: #ff9c00">{{ item.unit_Price }}</td> <td style="color: #ff9c00">{{ moneyFormatN(item.unit_Price) }}</td>
<td> <td>
<p style="color: #ff9c00"> <p style="color: #ff9c00">
...@@ -1824,9 +1824,9 @@ ...@@ -1824,9 +1824,9 @@
</table> </table>
</div> </div>
<span v-if="item.dueInMoney == 0" style="cursor: pointer" @click="getOrderDetail(item)" <span v-if="item.dueInMoney == 0" style="cursor: pointer" @click="getOrderDetail(item)"
slot="reference">{{ item.income }}</span> slot="reference">{{ moneyFormatN(item.income) }}</span>
<span v-if="item.dueInMoney != 0" style="cursor: pointer; color: #e95252" @click="getOrderDetail(item)" <span v-if="item.dueInMoney != 0" style="cursor: pointer; color: #e95252" @click="getOrderDetail(item)"
slot="reference">{{ item.income }}</span> slot="reference">{{ moneyFormatN(item.income) }}</span>
</el-popover> </el-popover>
</td> </td>
<!-- <td style="color: #ff9c00">{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td> --> <!-- <td style="color: #ff9c00">{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td> -->
...@@ -1878,7 +1878,7 @@ ...@@ -1878,7 +1878,7 @@
cursor: pointer; cursor: pointer;
color: #e95252; color: #e95252;
text-decoration: underline; text-decoration: underline;
" slot="reference">{{ item.discountMoney }}</span> " slot="reference">{{ moneyFormatN(item.discountMoney) }}</span>
</el-popover> </el-popover>
</td> </td>
<td> <td>
...@@ -1914,20 +1914,20 @@ ...@@ -1914,20 +1914,20 @@
cursor: pointer; cursor: pointer;
color: #e95252; color: #e95252;
text-decoration: underline; text-decoration: underline;
" slot="reference">{{ item.redEnvelopeMoney }}</span> " slot="reference">{{ moneyFormatN(item.redEnvelopeMoney) }}</span>
</el-popover> </el-popover>
<span v-else style="color: #e95252; text-decoration: underline">{{ <span v-else style="color: #e95252; text-decoration: underline">{{
item.redEnvelopeMoney moneyFormatN(item.redEnvelopeMoney)
}}</span> }}</span>
</td> </td>
<td>{{ item.refund }}</td> <td>{{ moneyFormatN(item.refund) }}</td>
<td>{{ item.platformTax }}</td> <td>{{ moneyFormatN(item.platformTax) }}</td>
<td>{{ item.zaiTuMoney }}</td> <td>{{ moneyFormatN(item.zaiTuMoney) }}</td>
<td>{{ item.cashReceiptsMoney }}</td> <td>{{ moneyFormatN(item.cashReceiptsMoney) }}</td>
<td> <td>
<span :class="{ <span :class="{
color_red_order: item.dueInMoney !== item.preferPrice, color_red_order: item.dueInMoney !== item.preferPrice,
}">{{ item.dueInMoney }}</span> }">{{ moneyFormatN(item.dueInMoney) }} </span>
</td> </td>
<td v-if="item.isChargeLossOrders == 1" class="fz12" style="color: #e95252"> <td v-if="item.isChargeLossOrders == 1" class="fz12" style="color: #e95252">
{{ $t("fnc.shousun") }} {{ $t("fnc.shousun") }}
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ b04570d9
...@@ -1933,7 +1933,7 @@ ...@@ -1933,7 +1933,7 @@
}}{{ item.fSeatNum > 0 ? item.fSeatNum + "F " : "" }}</span> }}{{ item.fSeatNum > 0 ? item.fSeatNum + "F " : "" }}</span>
</td> </td>
<td style="color: #ff9c00"> <td style="color: #ff9c00">
<span>{{ item.tC_Price }}</span> <span>{{ moneyFormatN(item.tC_Price) }}</span>
</td> </td>
<td style="color: #ff9c00"> <td style="color: #ff9c00">
<span v-if=" <span v-if="
...@@ -1941,7 +1941,7 @@ ...@@ -1941,7 +1941,7 @@
IsSupperOrderEdit || IsSupperOrderEdit ||
IsLookOrder || IsLookOrder ||
isUpdateOrder isUpdateOrder
">{{ item.unit_Price }}</span> ">{{ moneyFormatN(item.unit_Price) }}</span>
<span v-else>*****</span> <span v-else>*****</span>
</td> </td>
<td> <td>
...@@ -1992,11 +1992,11 @@ ...@@ -1992,11 +1992,11 @@
<span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder" :style="{ <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder" :style="{
cursor: 'pointer', cursor: 'pointer',
color: item.dueInMoney === 0 ? '' : '#e95252', color: item.dueInMoney === 0 ? '' : '#e95252',
}" @click="getOrderDetail(item)" slot="reference">{{ item.income }}</span> }" @click="getOrderDetail(item)" slot="reference">{{ moneyFormatN(item.income) }}</span>
<span v-else>******</span> <span v-else>******</span>
</el-popover> </el-popover>
</td> </td>
<td style="color: #ff9c00"><span>{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</span></td> <td style="color: #ff9c00"><span>{{ item.preferTipAmount?moneyFormatN(item.preferTipAmount):'0' }}</span></td>
<!-- 优惠 --> <!-- 优惠 -->
<td> <td>
<el-popover style="padding: 0" width="600" trigger="click"> <el-popover style="padding: 0" width="600" trigger="click">
...@@ -2034,7 +2034,7 @@ ...@@ -2034,7 +2034,7 @@
cursor: pointer; cursor: pointer;
color: #e95252; color: #e95252;
text-decoration: underline; text-decoration: underline;
" @click="getOrderDetail(item)" slot="reference">{{ item.discountMoney }}</span> " @click="getOrderDetail(item)" slot="reference">{{ moneyFormatN(item.discountMoney) }}</span>
</el-popover> </el-popover>
</td> </td>
<td> <td>
...@@ -2070,36 +2070,36 @@ ...@@ -2070,36 +2070,36 @@
cursor: pointer; cursor: pointer;
color: #e95252; color: #e95252;
text-decoration: underline; text-decoration: underline;
" slot="reference">{{ item.redEnvelopeMoney }}</span> " slot="reference">{{ moneyFormatN(item.redEnvelopeMoney) }}</span>
</el-popover> </el-popover>
<span v-else style=" <span v-else style="
cursor: pointer; cursor: pointer;
color: #e95252; color: #e95252;
text-decoration: underline; text-decoration: underline;
">{{ item.redEnvelopeMoney }}</span> ">{{ moneyFormatN(item.redEnvelopeMoney) }}</span>
</span> </span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td> <td>
<span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ item.refund }}</span> <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ moneyFormatN(item.refund) }}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td> <td>
<span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ item.platformTax }}</span> <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ moneyFormatN(item.platformTax) }}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td> <td>
<span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ item.zaiTuMoney }}</span> <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ moneyFormatN(item.zaiTuMoney) }}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td> <td>
<span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ item.cashReceiptsMoney }}</span> <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ moneyFormatN(item.cashReceiptsMoney) }}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td> <td>
<span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder" :class="{ <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder" :class="{
color_red_order: item.dueInMoney !== item.preferPrice, color_red_order: item.dueInMoney !== item.preferPrice,
}">{{ item.dueInMoney }}</span> }">{{ moneyFormatN(item.dueInMoney) }}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td v-if="item.isChargeLossOrders == 1" class="fz12" style="color: #e95252"> <td v-if="item.isChargeLossOrders == 1" class="fz12" style="color: #e95252">
...@@ -2549,7 +2549,7 @@ ...@@ -2549,7 +2549,7 @@
v-if="item.changePriceId>0&&(item.isOwn == 1 || IsSupperOrderEdit ||IsLookOrder || isUpdateOrder)" v-if="item.changePriceId>0&&(item.isOwn == 1 || IsSupperOrderEdit ||IsLookOrder || isUpdateOrder)"
style=" overflow:hidden;margin-top:10px;"> style=" overflow:hidden;margin-top:10px;">
<span style="color:red;">{{$t('objFill.gaijiashenq')}}:</span> <span> {{item.changePriceTime}} {{$t('objFill.shengqingje')}}【<span <span style="color:red;">{{$t('objFill.gaijiashenq')}}:</span> <span> {{item.changePriceTime}} {{$t('objFill.shengqingje')}}【<span
style="color:red;">{{item.changePriceMoney}}</span>{{$t('hotel.hotel_yuan')}}】{{item.changePriceReason}}</span> style="color:red;">{{moneyFormatN(item.changePriceMoney)}}</span>{{$t('hotel.hotel_yuan')}}】{{item.changePriceReason}}</span>
<div style="text-align:right;" v-if="item.changePriceState==1"> {{$t('objFill.dai')}}{{item.ChangePriceType=="2"?"OP":$t('fnc.zhuguan')}}{{item.managerExamineName}}{{$t('fnc.shenhe')}} </div> <div style="text-align:right;" v-if="item.changePriceState==1"> {{$t('objFill.dai')}}{{item.ChangePriceType=="2"?"OP":$t('fnc.zhuguan')}}{{item.managerExamineName}}{{$t('fnc.shenhe')}} </div>
<div style="text-align:right;" v-if="item.changePriceState==2"> <div style="text-align:right;" v-if="item.changePriceState==2">
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ b04570d9
...@@ -1552,12 +1552,12 @@ ...@@ -1552,12 +1552,12 @@
<span>{{item.tC_Price}}</span> <span>{{item.tC_Price}}</span>
</td> </td>
<td style="color:#FF9C00"> <td style="color:#FF9C00">
<span v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">{{item.unit_Price}}</span> <span v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">{{moneyFormatN(item.unit_Price)}}</span>
<span v-else>*****</span> <span v-else>*****</span>
</td> </td>
<td> <td>
<p style="color:#FF9C00"> <p style="color:#FF9C00">
<span v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">{{item.preferPrice}}</span> <span v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">{{moneyFormatN(item.preferPrice)}}</span>
<span v-else>*****</span> <span v-else>*****</span>
</p> </p>
</td> </td>
...@@ -1574,7 +1574,7 @@ ...@@ -1574,7 +1574,7 @@
<tr v-if='orderList.length>0' v-for="(item2,index2) in orderList" :key="index2"> <tr v-if='orderList.length>0' v-for="(item2,index2) in orderList" :key="index2">
<td>{{item2.FrID}}</td> <td>{{item2.FrID}}</td>
<td> <td>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item2.PayMoney}}</span> <span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{moneyFormatN(item2.PayMoney)}}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td>{{item2.TypeName}}</td> <td>{{item2.TypeName}}</td>
...@@ -1587,7 +1587,7 @@ ...@@ -1587,7 +1587,7 @@
</div> </div>
<span v-if='item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder' <span v-if='item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder'
:style="{cursor: 'pointer',color:item.isEnd===0 ? '' : '#e95252' }" @click="getOrderDetail(item)" :style="{cursor: 'pointer',color:item.isEnd===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span> slot="reference">{{moneyFormatN(item.income)}}</span>
<span v-else>******</span> <span v-else>******</span>
</el-popover> </el-popover>
...@@ -1626,30 +1626,30 @@ ...@@ -1626,30 +1626,30 @@
</table> </table>
</div> </div>
<span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)" <span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span> slot="reference">{{moneyFormatN(item.income)}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)"
slot="reference">{{item.discountMoney}}</span> slot="reference">{{moneyFormatN(item.discountMoney)}}</span>
</el-popover> </el-popover>
</td> </td>
<td> <td>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.refund}}</span> <span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{moneyFormatN(item.refund)}}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td> <td>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.platformTax}}</span> <span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{moneyFormatN(item.platformTax)}}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td> <td>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.zaiTuMoney}}</span> <span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{moneyFormatN(item.zaiTuMoney)}}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td> <td>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.cashReceiptsMoney}}</span> <span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{moneyFormatN(item.cashReceiptsMoney)}}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td> <td>
<span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder" <span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder"
:class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span> :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{moneyFormatN(item.dueInMoney)}}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td> <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td>
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ b04570d9
...@@ -1515,10 +1515,10 @@ ...@@ -1515,10 +1515,10 @@
({{$t('salesModule.RefuseQ')}} {{item.refuseVisaNum}}{{$t('sm.person')}}) ({{$t('salesModule.RefuseQ')}} {{item.refuseVisaNum}}{{$t('sm.person')}})
</span> </span>
</td> </td>
<td style="color:#FF9C00">{{item.tC_Price}}</td> <td style="color:#FF9C00">{{moneyFormatN(item.tC_Price)}}</td>
<td style="color:#FF9C00">{{item.unit_Price}}</td> <td style="color:#FF9C00">{{moneyFormatN(item.unit_Price)}}</td>
<td> <td>
<p style="color:#FF9C00">{{item.preferPrice}}</p> <p style="color:#FF9C00">{{moneyFormatN(item.preferPrice)}}</p>
</td> </td>
<td> <td>
<el-popover style='padding: 0;' width="370" trigger="click"> <el-popover style='padding: 0;' width="370" trigger="click">
...@@ -1542,9 +1542,9 @@ ...@@ -1542,9 +1542,9 @@
</table> </table>
</div> </div>
<span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)" <span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span> slot="reference">{{moneyFormatN(item.income)}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span> slot="reference">{{moneyFormatN(item.income)}}</span>
</el-popover> </el-popover>
</td> </td>
<!-- 优惠 --> <!-- 优惠 -->
...@@ -1580,14 +1580,14 @@ ...@@ -1580,14 +1580,14 @@
</tr> </tr>
</table> </table>
</div> </div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{item.discountMoney}}</span> <span style="cursor: pointer;color: #e95252;" slot="reference">{{moneyFormatN(item.discountMoney)}}</span>
</el-popover> </el-popover>
</td> </td>
<td>{{item.refund}}</td> <td>{{moneyFormatN(item.refund)}}</td>
<td>{{item.platformTax}}</td> <td>{{moneyFormatN(item.platformTax)}}</td>
<td>{{item.zaiTuMoney}}</td> <td>{{moneyFormatN(item.zaiTuMoney)}}</td>
<td>{{item.cashReceiptsMoney}}</td> <td>{{moneyFormatN(item.cashReceiptsMoney)}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td> <td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{moneyFormatN(item.dueInMoney)}}</span></td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td> <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td> <td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td width="120"> <td width="120">
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ b04570d9
...@@ -1896,9 +1896,9 @@ ...@@ -1896,9 +1896,9 @@
</span> </span>
</td> </td>
<!-- <td>{{ item.TC_Price }}</td> --> <!-- <td>{{ item.TC_Price }}</td> -->
<td>{{ item.Unit_Price }}</td> <td>{{ moneyFormatN(item.Unit_Price) }}</td>
<td> <td>
<p>{{ item.PreferPrice }}</p> <p>{{ moneyFormatN(item.PreferPrice) }}</p>
</td> </td>
<td> <td>
<el-popover style="padding: 0" width="400" trigger="click"> <el-popover style="padding: 0" width="400" trigger="click">
...@@ -1926,12 +1926,12 @@ ...@@ -1926,12 +1926,12 @@
</table> </table>
</div> </div>
<span v-if="item.DueInMoney == 0" style="cursor: pointer" @click="getOrderDetail(item)" <span v-if="item.DueInMoney == 0" style="cursor: pointer" @click="getOrderDetail(item)"
slot="reference">{{ item.Income }}</span> slot="reference">{{ moneyFormatN(item.Income) }}</span>
<span v-if="item.DueInMoney != 0" class="colorE95252" style="cursor: pointer" <span v-if="item.DueInMoney != 0" class="colorE95252" style="cursor: pointer"
@click="getOrderDetail(item)" slot="reference">{{ item.Income }}</span> @click="getOrderDetail(item)" slot="reference">{{ moneyFormatN(item.Income) }}</span>
</el-popover> </el-popover>
</td> </td>
<td>{{item.PreferTipAmount ? item.PreferTipAmount : "0.00" }}</td> <td>{{item.PreferTipAmount ? moneyFormatN(item.PreferTipAmount) : "0.00" }}</td>
<!-- 优惠 --> <!-- 优惠 -->
<td> <td>
<el-popover style="padding: 0" width="600" trigger="click"> <el-popover style="padding: 0" width="600" trigger="click">
...@@ -1969,7 +1969,7 @@ ...@@ -1969,7 +1969,7 @@
</table> </table>
</div> </div>
<span style="cursor:pointer;color:#e95252;text-decoration:underline;" <span style="cursor:pointer;color:#e95252;text-decoration:underline;"
slot="reference">{{ moneyFormat(item.DiscountMoney) }}</span> slot="reference">{{ moneyFormatN(item.DiscountMoney) }}</span>
</el-popover> </el-popover>
</td> </td>
<td> <td>
...@@ -2003,17 +2003,17 @@ ...@@ -2003,17 +2003,17 @@
</div> </div>
<span @click="getRedBag(item)" <span @click="getRedBag(item)"
style="cursor:pointer;color:#e95252;padding:0 15px;text-decoration:underline;" style="cursor:pointer;color:#e95252;padding:0 15px;text-decoration:underline;"
slot="reference">{{ item.RedEnvelopeMoney }}</span> slot="reference">{{ moneyFormatN(item.RedEnvelopeMoney) }}</span>
</el-popover> </el-popover>
<span v-else <span v-else
style="cursor:pointer;color:#e95252;text-decoration:underline;">{{ item.RedEnvelopeMoney }}</span> style="cursor:pointer;color:#e95252;text-decoration:underline;">{{ moneyFormatN(item.RedEnvelopeMoney) }}</span>
</td> </td>
<td>{{ item.Refund }}</td> <td>{{ moneyFormatN(item.Refund) }}</td>
<td>{{ item.PlatformTax }}</td> <td>{{ moneyFormatN(item.PlatformTax) }}</td>
<td>{{ item.ZaiTuMoney }}</td> <td>{{ moneyFormatN(item.ZaiTuMoney) }}</td>
<td>{{ item.CashReceiptsMoney }}</td> <td>{{ moneyFormatN(item.CashReceiptsMoney) }}</td>
<td> <td>
<span :class="{color_red_order: item.DueInMoney && item.DueInMoney > 0, }">{{ item.DueInMoney }}</span> <span :class="{color_red_order: item.DueInMoney && item.DueInMoney > 0, }">{{ moneyFormatN(item.DueInMoney) }}</span>
</td> </td>
<td class="fz12"> <td class="fz12">
<span :class="{ 'RL-redType': item.statsstr == '候补' }">{{item.statsstr}}</span> <span :class="{ 'RL-redType': item.statsstr == '候补' }">{{item.statsstr}}</span>
...@@ -2407,7 +2407,7 @@ ...@@ -2407,7 +2407,7 @@
</span> </span>
</td> </td>
<!-- <td>{{childItem.Unit_Price}}单价</td> --> <!-- <td>{{childItem.Unit_Price}}单价</td> -->
<td>{{ childItem.Unit_Price }}</td> <td>{{ moneyFormatN(childItem.Unit_Price) }}</td>
<td class="nowrap"> <td class="nowrap">
<p style="text-decoration: underline;cursor: pointer;"> <p style="text-decoration: underline;cursor: pointer;">
<PriceDetail :OrderId="childItem.OrderId" :PreferPrice="childItem.PreferPrice"></PriceDetail> <PriceDetail :OrderId="childItem.OrderId" :PreferPrice="childItem.PreferPrice"></PriceDetail>
...@@ -2442,13 +2442,13 @@ ...@@ -2442,13 +2442,13 @@
</table> </table>
</div> </div>
<span v-if="childItem.DueInMoney == 0" style="cursor: pointer" @click="getOrderDetail(childItem)" <span v-if="childItem.DueInMoney == 0" style="cursor: pointer" @click="getOrderDetail(childItem)"
slot="reference">{{ childItem.Income }}</span> slot="reference">{{ moneyFormatN(childItem.Income) }}</span>
<span v-if="childItem.DueInMoney != 0" class="colorE95252" style="cursor: pointer" <span v-if="childItem.DueInMoney != 0" class="colorE95252" style="cursor: pointer"
@click="getOrderDetail(childItem)" slot="reference">{{ childItem.Income }}</span> @click="getOrderDetail(childItem)" slot="reference">{{ moneyFormatN(childItem.Income) }}</span>
</el-popover> </el-popover>
</td> </td>
<td> <td>
{{ childItem.PreferTipAmount ? childItem.PreferTipAmount : "0.00"}} {{ childItem.PreferTipAmount ? moneyFormatN(childItem.PreferTipAmount) : "0"}}
</td> </td>
<!-- 其他类型的优惠 --> <!-- 其他类型的优惠 -->
<td class="nowrap"> <td class="nowrap">
...@@ -2489,17 +2489,17 @@ ...@@ -2489,17 +2489,17 @@
</tr> </tr>
</table> </table>
</div> </div>
<span style="cursor: pointer; color: #e95252" slot="reference">{{ childItem.DiscountMoney }}</span> <span style="cursor: pointer; color: #e95252" slot="reference">{{ moneyFormatN(childItem.DiscountMoney) }}</span>
</el-popover> </el-popover>
</td> </td>
<td class="nowrap">{{ childItem.RedEnvelopeMoney }}</td> <td class="nowrap">{{ moneyFormatN(childItem.RedEnvelopeMoney) }}</td>
<td class="nowrap">{{ childItem.Refund }}</td> <td class="nowrap">{{ moneyFormatN(childItem.Refund) }}</td>
<td class="nowrap">{{ childItem.PlatformTax }}</td> <td class="nowrap">{{ moneyFormatN(childItem.PlatformTax) }}</td>
<td class="nowrap">{{ childItem.ZaiTuMoney }}</td> <td class="nowrap">{{ moneyFormatN(childItem.ZaiTuMoney) }}</td>
<td class="nowrap">{{ childItem.CashReceiptsMoney }}</td> <td class="nowrap">{{ moneyFormatN(childItem.CashReceiptsMoney) }}</td>
<td class="nowrap"> <td class="nowrap">
<span <span
:class="{color_red_order:childItem.DueInMoney && childItem.DueInMoney > 0,}">{{ childItem.DueInMoney }}</span> :class="{color_red_order:childItem.DueInMoney && childItem.DueInMoney > 0,}">{{ moneyFormatN(childItem.DueInMoney) }}</span>
</td> </td>
<td v-if="childItem.IsChargeLossOrders == 1" class="fz12" style="color: #e95252"> <td v-if="childItem.IsChargeLossOrders == 1" class="fz12" style="color: #e95252">
{{ $t("fnc.shousun") }} {{ $t("fnc.shousun") }}
...@@ -2872,7 +2872,7 @@ ...@@ -2872,7 +2872,7 @@
<div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;margin-top:10px;"> <div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;margin-top:10px;">
<span>{{$t('objFill.gaijiashenq')}}: <span>{{$t('objFill.gaijiashenq')}}:
{{childItem.ChangePriceTime}}{{$t('objFill.shengqingje')}}【<span {{childItem.ChangePriceTime}}{{$t('objFill.shengqingje')}}【<span
style="color:red;">{{childItem.ChangePriceMoney}}</span>{{$t('hotel.hotel_yuan')}}】{{childItem.ChangePriceReason}}</span> style="color:red;">{{moneyFormatN(childItem.ChangePriceMoney)}}</span>{{$t('hotel.hotel_yuan')}}】{{childItem.ChangePriceReason}}</span>
<div style="text-align:right;" v-if="childItem.ChangePriceState==1"> <div style="text-align:right;" v-if="childItem.ChangePriceState==1">
{{$t('objFill.dai')}}{{childItem.ChangePriceType=="2"?"OP":$t('fnc.zhuguan')}}{{childItem.ManagerExamineName}}{{$t('fnc.shenhe')}} {{$t('objFill.dai')}}{{childItem.ChangePriceType=="2"?"OP":$t('fnc.zhuguan')}}{{childItem.ManagerExamineName}}{{$t('fnc.shenhe')}}
</div> </div>
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ b04570d9
...@@ -64,24 +64,28 @@ ...@@ -64,24 +64,28 @@
</el-table-column> </el-table-column>
<el-table-column prop="Money" :label="$t('fnc.a_zongjine')" min-width="100" show-overflow-tooltip> <el-table-column prop="Money" :label="$t('fnc.a_zongjine')" min-width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.Money }}&ensp;({{ scope.row.CurrencyName }}) {{ moneyFormatN(scope.row.Money) }}&ensp;({{ scope.row.CurrencyName }})
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Income" :label="$t('fnc.shishou')"> </el-table-column> <el-table-column prop="Income" :label="$t('fnc.shishou')"><template slot-scope="scope">{{ moneyFormatN(scope.row.Income) }}</template></el-table-column>
<el-table-column prop="CashReceiptsMoney" :label="$t('objFill.xianshouzt')"> </el-table-column> <el-table-column prop="CashReceiptsMoney" :label="$t('objFill.xianshouzt')"> <template slot-scope="scope">{{ moneyFormatN(scope.row.CashReceiptsMoney) }}</template></el-table-column>
<el-table-column prop="PlatformMoney" :label="$t('Operation.Op_platZaitu')" min-width="80"> <el-table-column prop="PlatformMoney" :label="$t('Operation.Op_platZaitu')" min-width="80">
<template slot-scope="scope">{{ moneyFormatN(scope.row.PlatformMoney) }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="PreferTipAmount" :label="$t('op.RTXF')" min-width="80"> <el-table-column prop="PreferTipAmount" :label="$t('op.RTXF')" min-width="80">
<template slot-scope="scope">{{ moneyFormatN(scope.row.PreferTipAmount) }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="PlatformTax" :label="$t('fnc.shouxufei')" min-width="70"> <el-table-column prop="PlatformTax" :label="$t('fnc.shouxufei')" min-width="70">
<template slot-scope="scope">{{ moneyFormatN(scope.row.PlatformTax) }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="Refund" :label="$t('fnc.tuikuan')"> </el-table-column> <el-table-column prop="Refund" :label="$t('fnc.tuikuan')"> <template slot-scope="scope">{{ moneyFormatN(scope.row.Refund) }}</template></el-table-column>
<el-table-column prop="CostMoney" :label="$t('hotel.hotel_cost')"> <el-table-column prop="CostMoney" :label="$t('hotel.hotel_cost')">
<template slot-scope="scope">{{ moneyFormatN(scope.row.CostMoney) }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="DueInMoney" :label="$t('op.Tocollected')"> <el-table-column prop="DueInMoney" :label="$t('op.Tocollected')">
<template slot-scope="scope"> <template slot-scope="scope">
<span :class="{ red: scope.row.DueInMoney > 0 }">{{ <span :class="{ red: scope.row.DueInMoney > 0 }">{{
scope.row.DueInMoney moneyFormatN(scope.row.DueInMoney)
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -455,6 +459,7 @@ ...@@ -455,6 +459,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('objFill.shengqingjje')" prop=""> <el-form-item :label="$t('objFill.shengqingjje')" prop="">
<el-input type="number" :placeholder="$t('objFill.zuizyszje')" v-model="changePriceMsg.Money"></el-input> <el-input type="number" :placeholder="$t('objFill.zuizyszje')" v-model="changePriceMsg.Money"></el-input>
<span v-if="userInfo.RB_Group_id==2 && userInfo.RB_Branch_id==1252">{{moneyFormatN(changePriceMsg.Money)}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
......
src/components/orderCommon/PriceDetail.vue
View file @ b04570d9
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<td>{{ OrderPrice.TipAmount ? OrderPrice.TipAmount : "0.00" }}</td> <td>{{ OrderPrice.TipAmount ? OrderPrice.TipAmount : "0.00" }}</td>
</tr> </tr>
</table> </table>
<span slot="reference" class="price" @click="CalculationDetails">{{ PreferPrice }}</span> <span slot="reference" class="price" @click="CalculationDetails">{{ moneyFormatN(PreferPrice) }}</span>
</el-popover> </el-popover>
</div> </div>
......
src/plug/index.js
View file @ b04570d9
...@@ -1453,6 +1453,20 @@ export default { ...@@ -1453,6 +1453,20 @@ export default {
} }
return x1 + x2; return x1 + x2;
}, },
//价钱格式化，三位数逗号分隔，保留两位小数 （如果没有小数，则舍弃小数） ld
Vue.prototype.moneyFormatN = function (value) {
let nStr = Number(value).toFixed(2)
nStr += '';
let x = nStr.split('.');
let x1 = x[0];
let x2 = x.length > 1 ? '.' + x[1] : '';
if(x2=='.00'){x2='';}
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, '$1' + ',' + '$2');
}
return x1 + x2;
},
//价钱格式化，三位数逗号分隔，保留八位小数 duanjun //价钱格式化，三位数逗号分隔，保留八位小数 duanjun
Vue.prototype.moneyFormatB = function (value) { Vue.prototype.moneyFormatB = function (value) {
let nStr = Number(value).toFixed(8) let nStr = Number(value).toFixed(8)
......
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