Skip to content

S
SuperMan
Commit dc6d1cf9 authored by 吴春's avatar 吴春
Browse files
Options

index.js冲突

parents be6a8ed6 cc1d8eeb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1356 additions and 999 deletions
src/assets/css/cssReset.css
View file @ dc6d1cf9
......@@ -543,12 +543,13 @@ vertical-align:middle
bottom: 0;
left: 50px;
padding: 10px;
overflow: auto;
overflow: hidden;
font-family: 'PingFangSc-Fine';
z-index: 999;
right: 0;
background-color: #fff;
border-top: 3px solid #38425d;
padding-bottom: 30px;
}
.bottom-box .btm-title{
padding-left: 10px;
......@@ -569,4 +570,46 @@ vertical-align:middle
.page_ShoppingReimbursementDetails .avatar-uploader-icon {
height: auto !important;
}
\ No newline at end of file
}
/************************** luochao 重新定义表格样式 BEGIN *******************************/
.al-tab{
width: 100%;
border-collapse: collapse;
}
.al-tab .center.th,.al-tab .center.td{
text-align: center !important;
}
.al-tab,.al-tab th, .al-tab td{
border:1px solid #ddd;
}
.al-tab caption{
font-size: 18px;
color: #333;
height: 40px;
line-height: 40px;
text-align: left;
padding-left: 12px;
}
.al-tab th{
background: #E6E6E6;
height: 40px;
line-height: 40px;
color: #333;
font-size: 16px;
font-weight: 300;
text-align: left;
padding-left:5px;
}
.al-tab td{
height: 40px;
line-height: 40px;
color: #333;
font-size: 12px;
font-weight: 300;
text-align: left;
padding-left:5px;
}
/************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file
src/components/SalesModule/enrollTotalTwo.vue
View file @ dc6d1cf9
......@@ -263,7 +263,7 @@
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{moneyFormat(item.zaiTuMoney)}}</td>
<td>{{moneyFormat(item.weiShouMoney)}}</td>
<td class="weiShou">{{moneyFormat(item.weiShouMoney)}}</td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
</tr>
<tr>
......@@ -939,5 +939,8 @@
display: inline-block;
margin: 0 10px 0 0;
}
.enrollTotalSearchTable .weiShou{
color: red;
}
</style>
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ dc6d1cf9
......@@ -799,6 +799,10 @@
font-size: 14px;
vertical-align: top;
}
.RegistrationList .nowrap{
white-space:nowrap;
}
</style>
<template>
......@@ -1330,18 +1334,18 @@
<tr>
<th width="240">单号</th>
<th width="150">客户信息</th>
<th width="70">人数/机位数</th>
<th width="110">单价</th>
<th width="110">成交单价</th>
<th width="110">应收总额</th>
<th width="110">实收</th>
<th width="110">退款</th>
<th width="110">平台税金</th>
<th width="110">平台在途</th>
<th width="80">待收金额</th>
<th width="100">状态</th>
<th width="130">确认函</th>
<th width="150">操作</th>
<th width="70" class="nowrap">人数/机位数</th>
<th width="110" class="nowrap">单价</th>
<th width="110" class="nowrap">成交单价</th>
<th width="110" class="nowrap">应收总额</th>
<th width="110" class="nowrap">实收</th>
<th width="110" class="nowrap">退款</th>
<th width="110" class="nowrap">平台税金</th>
<th width="110" class="nowrap">平台在途</th>
<th width="110" class="nowrap">待收金额</th>
<th width="100" class="nowrap">状态</th>
<th width="130" class="nowrap">确认函</th>
<th width="150" class="nowrap">操作</th>
</tr>
<tr>
<td v-show="OrderDataList.Length==0" colspan="14" align="center">暂无数据</td>
......@@ -1394,9 +1398,9 @@
</tr>
</table>
</div>
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td>{{item.TC_Price}}</td>
......@@ -1571,17 +1575,17 @@
</tr>
</table>
</div>
<span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td>{{childItem.TC_Price}}</td>
<td class="nowrap">{{childItem.TC_Price}}</td>
<td>{{childItem.Unit_Price}}</td>
<td>
<td class="nowrap">
<p>{{childItem.PreferPrice}}</p>
</td>
<td>
<td class="nowrap">
<el-popover style='padding: 0;' width="400" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
......@@ -1608,10 +1612,10 @@
@click="getOrderDetail(childItem)" slot="reference">{{childItem.Income}}</span>
</el-popover>
</td>
<td>{{childItem.Refund}}</td>
<td>{{childItem.PlatformTax}}</td>
<td>{{childItem.ZaiTuMoney}}</td>
<td><span :class="{color_red_order:childItem.DueInMoney!==childItem.PreferPrice}">{{childItem.DueInMoney}}</span></td>
<td class="nowrap">{{childItem.Refund}}</td>
<td class="nowrap">{{childItem.PlatformTax}}</td>
<td class="nowrap">{{childItem.ZaiTuMoney}}</td>
<td class="nowrap"><span :class="{color_red_order:childItem.DueInMoney!==childItem.PreferPrice}">{{childItem.DueInMoney}}</span></td>
<td class="fz12"><span :class="{'RL-redType':childItem.statsstr=='候补'}">{{childItem.statsstr}}</span></td>
<td>
<div @click="goOpenUrl('confirmationOrder',childItem.OrderId)" style="cursor:pointer;">电子确认函</div>
......@@ -2824,14 +2828,14 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
if (this.addMsg.Commission > 0) {
this.addMsg.CommissionShareMoney = this.addMsg.Commission / 2;
this.addMsg.Commission =
this.addMsg.Commission - this.addMsg.CommissionShareMoney;
(this.addMsg.Commission - this.addMsg.CommissionShareMoney).toFixed(2);
} else {
this.addMsg.CommissionShareMoney = "0";
}
}
}
} else {
this.addMsg.Commission = Number(this.addMsg.PreferPrice) * 0.01
this.addMsg.Commission = (Number(this.addMsg.PreferPrice) * 0.01).toFixed(2)
}
},
getHouseNo() {
......
src/plug/index.js
View file @ dc6d1cf9
This diff is collapsed.
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