Skip to content

S
SuperMan
Commit 5acb8f4a authored by youjie's avatar youjie
Browse files
Options

no message

parent 24ab0772
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 418 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 5acb8f4a
......@@ -1536,7 +1536,11 @@
}">{{ $t("Operation.Op_weiShou") }}：{{
countData.DueinMoney
}};</span>
<span>应收小费：{{ countData.PreferTipAmount?countData.PreferTipAmount:'0' }};</span>
<span>已收小费：{{ countData.CompensationMoney?countData.CompensationMoney:'0' }};</span>
<span>未收小费：{{ countData.PreferTipAmount-countData.CompensationMoney }};</span>
<span>{{ $t("fnc.ztjine") }}：{{ countData.ZaiTu }};</span>
</p>
</div>
</el-col>
......@@ -1642,9 +1646,10 @@
<th width="60">{{ $t("Airticket.Air_Number") }}</th>
<th width="80">{{ $t("fnc.danjia") }}</th>
<th width="80">{{ $t("fnc.cjdanjia") }}</th>
<th width="80">人头小费</th>
<th width="80">{{ $t("fnc.yszonge") }}</th>
<th width="80">{{ $t("fnc.shishou") }}</th>
<th width="80">人头小费</th>
<th width="70">{{ $t("fnc.youhui") }}</th>
<th width="70">{{ $t("salesModule.HappinessPassbook") }}</th>
<th width="70">{{ $t("fnc.tuikuan") }}</th>
......@@ -1793,7 +1798,7 @@
</td>
<td style="color: #ff9c00">{{ item.tC_Price }}</td>
<td style="color: #ff9c00">{{ item.unit_Price }}</td>
<td style="color: #ff9c00">{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
<td>
<p style="color: #ff9c00">{{ item.preferPrice }}</p>
</td>
......@@ -1826,6 +1831,7 @@
slot="reference">{{ item.income }}</span>
</el-popover>
</td>
<td style="color: #ff9c00">{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
<!-- 优惠 -->
<td>
<el-popover style="padding: 0" width="600" trigger="click">
......@@ -2135,7 +2141,7 @@
</td>
</tr>
<tr style="height: 20px">
<td colspan="17" class="RL_Order" style="height: 20px">
<td colspan="18" class="RL_Order" style="height: 20px">
<span class="RL-remarkTitle" v-if="item.guestList.length > 0">{{ $t("salesModule.MD") }}:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length > 0">
<span v-for="childItem in item.guestList" style="color: blue">{{ childItem.userName }}
......@@ -2257,7 +2263,7 @@
审批说明：<span>{{ item.orderspecialofferReason }}</span>
</div>
</td>
<td colspan="4" class="groupTourOrder_tickets" style="height: 40px">
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>{{ $t("fnc.skdanju") }}：</div>
<div>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 5acb8f4a
......@@ -1769,10 +1769,9 @@
<th width="100">人数/机位数</th>
<th width="80">单价</th>
<th width="80">成交单价</th>
<th width="80">人头小费</th>
<!-- <th width="80">实收小费</th> -->
<th width="80">应收总额</th>
<th width="80">实收</th>
<th width="80">人头小费</th>
<th width="70">优惠</th>
<th width="70">幸福存折</th>
<th width="70">退款</th>
......@@ -1792,7 +1791,7 @@
<template v-for="op in list">
<tbody class="not_border">
<tr>
<td colspan="17">
<td colspan="18">
类型：<span style="color: #e95252">{{ op.groupName }}</span>
</td>
</tr>
......@@ -1943,8 +1942,6 @@
">{{ item.unit_Price }}</span>
<span v-else>*****</span>
</td>
<td style="color: #ff9c00"><span>{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</span></td>
<!-- <td><span>{{ item.CompensationMoney }}</span></td> -->
<td>
<p style="color: #ff9c00">
<span v-if="
......@@ -1991,6 +1988,7 @@
<span v-else>******</span>
</el-popover>
</td>
<td style="color: #ff9c00"><span>{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</span></td>
<!-- 优惠 -->
<td>
<el-popover style="padding: 0" width="600" trigger="click">
......@@ -2326,7 +2324,7 @@
</td>
</tr>
<tr style="height: 20px">
<td colspan="16" class="RL_Order" style="height: 20px">
<td colspan="17" class="RL_Order" style="height: 20px">
<span class="RL-remarkTitle" v-if="
item.guestList.length > 0 &&
(item.isOwn == 1 ||
......@@ -2504,7 +2502,7 @@
</div>
<div v-else>******</div>
</td>
<td colspan="4" class="groupTourOrder_tickets" style="height: 40px">
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div @click="
goUrlSFD('SalesFinancialDetail', '销售财务单据', item)
">
......@@ -2567,7 +2565,7 @@
<tbody v-show="list.length !== 0">
<tr>
<td></td>
<td colspan="16" class="groupTourOrderByTuan_seat">
<td colspan="17" class="groupTourOrderByTuan_seat">
<div>
<span>本团机位：</span>
<span>{{
......
src/components/SalesModule/productQuery2.vue
View file @ 5acb8f4a
......@@ -39,275 +39,6 @@
overflow: hidden;
}
.productQueryList {
width: 100%;
min-width: 1366px;
padding-left: 10px;
}
.productQueryList li {
width: 100%;
border: 1px solid #e5e5e5;
background: #fff;
margin-bottom: 10px;
color: #333;
font-size: 14px;
}
.productQueryList li::after {
content: "";
display: block;
clear: both;
}
.productQueryList li i.iconfont {
color: #bbb;
margin-right: 8px;
}
.productQueryList li>div:first-child {
display: table;
width: 100%;
}
.productQueryList li>div>div {
display: table-cell;
border-right: 1px dashed #dcdfe6;
}
.productQueryList li>div>div:last-child {
border-right: none;
}
.productQueryList li .d11 {
float: left;
width: 160px;
height: 120px;
margin: 14px 14px 0 14px;
}
.productQueryList li .d11>li {
width: 160px;
height: 120px;
border: none;
}
.productQueryList li .d11>li>img {
width: 160px;
height: 120px;
}
.productQueryList li .d12 {
float: left;
padding-top: 18px;
width: 200px;
}
.productQueryList li .d12 .d12p {
margin-top: 3px;
font-size: 12px;
color: #999;
cursor: pointer;
max-height: 40px;
line-height: 20px;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.productQueryList li .d12 .d12p:hover {
text-decoration: underline;
color: #333;
}
.productQueryList li .d12 .d12TC {
margin: 5px 0;
color: #666666;
font-size: 12px;
}
.productQueryList li .d1 {
width: 18%;
position: relative;
padding: 0 20px;
}
.productQueryList li .d2 {
width: 14%;
text-align: center;
padding-top: 20px;
}
.productQueryList li .d2 p.flightNo {
background: #ccc;
width: 136px;
margin: 5px 0;
padding: 0 10px;
height: 22px;
line-height: 22px;
display: inline-block;
font-size: 14px;
}
.productQueryList li .d2 p.flightNo em {
font-style: normal;
color: #333;
font-size: 12px;
font-weight: bold;
}
.productQueryList li .d2 p.flightNo .flem {
height: 22px;
width: 50px;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.productQueryList li .d2 p>span {
color: #fff;
font-size: 12px;
border-radius: 10px;
background: #2aaef2;
padding: 2px 5px;
cursor: pointer;
}
.productQueryList li .d2>div>div {
display: inline-block;
line-height: 24px;
font-size: 12px;
}
.productQueryList li .d3 {
width: 17%;
padding-left: 40px;
padding-top: 20px;
}
.productQueryList li .d3 p {
line-height: 24px;
}
.productQueryList li .d3 p>span {
color: #666;
font-size: 12px;
margin-right: 10px;
}
.productQueryList li .d3 p>em {
background: #ff9c00;
font-style: normal;
margin-left: 8px;
color: #fff;
border-radius: 4px;
padding: 2px 5px;
}
.productQueryList li .d4 {
width: 10%;
padding-left: 20px;
padding-top: 20px;
}
.productQueryList li .d4 p span.price {
color: #333;
text-decoration: underline;
font-size: 12px;
}
.productQueryList li .d4 p span.price:hover {
color: #e95252;
font-weight: bold;
cursor: pointer;
}
.productQueryList li .d5 {
width: 15%;
padding-left: 40px;
padding-top: 20px;
}
.productQueryList li .d5 p {
line-height: 26px;
}
.productQueryList li .d5 p>span {
color: #666;
font-size: 12px;
margin-right: 10px;
}
.productQueryList li .d5 p>i {
font-weight: bold;
font-style: normal;
}
.productQueryList li .d8 {
width: 15%;
padding-left: 40px;
padding-top: 20px;
}
.productQueryList li .d8 p {
line-height: 26px;
}
.productQueryList li .d8 p>span {
color: #666;
font-size: 12px;
margin-right: 10px;
}
.productQueryList li .d8 p>i {
font-style: normal;
}
.productQueryList li .d6 {
padding: 20px 40px;
width: 100%;
height: inherit;
border-top: 1px solid #e5e5e5;
}
.productQueryList li .d6 p {
display: table-cell;
color: #e95252;
}
.productQueryList li .d6 p:nth-child(1) {
width: 60px;
font-size: 12px;
}
.productQueryList li .d7 {
width: 10%;
text-align: center;
padding: 40px 0 0 40px;
border-right: none;
}
.productQueryList li .d7 button {
width: 30px;
height: 30px;
border-radius: 4px;
}
.productQueryList li .d7 .el-button--primary {
padding: 5px;
margin: 0;
font-size: 14px !important;
color: #fff;
}
.productQueryList li .d7 i.iconfont {
color: #fff;
margin: 0;
}
.elPopoverLayer {
padding: 0px 10px;
}
......@@ -353,50 +84,7 @@
.superSearchLayer>div>span {
margin: 0 15px 0 5px;
}
.pro_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px;
overflow-y: auto;
}
.pro_tripDetails .popper__arrow::after {
border-bottom-color: #ededed !important;
}
.pro_tripDetails table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.pro_tripDetails table th {
background-color: #ededed;
padding: 5px;
}
.pro_tripDetails table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.pro_tripDetails table td._d_name {
background-color: #ededed;
}
.pro_tripDetails table ._color_666 {
color: #666666;
}
.pro_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
.productQuerybottomLayer {
overflow: auto;
position: fixed;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 5acb8f4a
......@@ -1840,9 +1840,10 @@
</th>
<th width="110" class="nowrap">{{ $t("fnc.danjia") }}</th>
<th width="110" class="nowrap">{{ $t("fnc.cjdanjia") }}</th>
<th width="110" class="nowrap">人头小费</th>
<th width="110" class="nowrap">{{ $t("fnc.yszonge") }}</th>
<th width="110" class="nowrap">{{ $t("fnc.shishou") }}</th>
<th width="110" class="nowrap">人头小费</th>
<th width="90" class="nowrap">{{ $t("fnc.youhui") }}</th>
<th width="90" class="nowrap">
{{ $t("salesModule.HappinessPassbook") }}
......@@ -1924,7 +1925,7 @@
</td>
<td>{{ item.TC_Price }}</td>
<td>{{ item.Unit_Price }}</td>
<td>{{ item.PreferTipAmount | priceFormat(item.PreferTipAmount) }}</td>
<td>
<p>{{ item.PreferPrice }}</p>
</td>
......@@ -1957,6 +1958,7 @@
@click="getOrderDetail(item)" slot="reference">{{ item.Income }}</span>
</el-popover>
</td>
<td>{{ item.PreferTipAmount?item.PreferTipAmount:'0.00' }}</td>
<!-- 优惠 -->
<td>
<el-popover style="padding: 0" width="600" trigger="click">
......@@ -2250,7 +2252,7 @@
<!-- 其他类型 -->
<template v-for="(subItem, subIndex) in OrderDataList.OtherOrderList">
<tr>
<td colspan="16">
<td colspan="17">
{{ $t("active.cl_orderType") }}：<span class="RL-redType">{{
subItem.GroupTypeName
}}</span>
......@@ -2418,7 +2420,7 @@
</td>
<td class="nowrap">{{ childItem.TC_Price }}</td>
<td>{{ childItem.Unit_Price }}</td>
<td>{{ childItem.PreferTipAmount?childItem.PreferTipAmount:'0.00' }}</td>
<td class="nowrap">
<p>{{ childItem.PreferPrice }}</p>
</td>
......@@ -2451,6 +2453,7 @@
@click="getOrderDetail(childItem)" slot="reference">{{ childItem.Income }}</span>
</el-popover>
</td>
<td>{{ childItem.PreferTipAmount?childItem.PreferTipAmount:'0.00' }}</td>
<!-- 其他类型的优惠 -->
<td class="nowrap">
<el-popover style="padding: 0" width="600" trigger="click">
......@@ -2685,7 +2688,7 @@
</td>
</tr>
<tr>
<td colspan="14" class="RL_Order">
<td colspan="15" class="RL_Order">
<span class="RL-remarkTitle" v-if="childItem.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span>
<span class="RL-redType RL-remarkCon" v-if="childItem.GuestList.length > 0">
<span style="color: blue !important" v-for="fourthItem in childItem.GuestList"
......@@ -2877,7 +2880,7 @@
审批说明：<span>{{ childItem.OrderspecialofferReason }}</span>
</div>
</td>
<td colspan="3" style="height: 40px; cursor: pointer">
<td colspan="4" style="height: 40px; cursor: pointer">
<div @click="
goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)
">
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 5acb8f4a
......@@ -367,9 +367,10 @@
<th width="50">{{ $t("admin.admin_personNumber") }}</th>
<th width="80">{{ $t("fnc.danjia") }}</th>
<th width="80">{{ $t("fnc.cjdanjia") }}</th>
<th width="80">人头小费</th>
<th width="80">{{ $t("fnc.yszonge") }}</th>
<th width="80">{{ $t("fnc.shishou") }}</th>
<th width="80">人头小费</th>
<th width="70">{{ $t("fnc.youhui") }}</th>
<th width="80">{{ $t("salesModule.HappinessPassbook") }}</th>
<th width="70">{{ $t("fnc.xiaofei") }}</th>
......@@ -557,7 +558,7 @@
</td>
<td style="color: #ff9c00">{{ item.tC_Price }}</td>
<td style="color: #ff9c00">￥{{ item.unit_Price }}</td>
<td style="color: #ff9c00">￥{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
<td>
<p style="color: #ff9c00">￥{{ item.preferPrice }}</p>
</td>
......@@ -568,6 +569,7 @@
item.income
}}</span>
</td>
<td style="color: #ff9c00">￥{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
<!-- 优惠 -->
<td>
<el-popover style="padding: 0" width="600" trigger="click">
......
src/components/myOrdersAllType/components/allList.vue
View file @ 5acb8f4a
......@@ -17,7 +17,7 @@
.HT_total p>span{
float: left;
display: inline-block;
width: 25%;
width: 33.33%;
}
.TC_leftSearch>div{
padding: 5px 0;
......@@ -259,6 +259,12 @@
<span>手续费：
{{item.PlatformTax.toFixed(2)}}
</span>
<span>应收小费：
{{item.PreferTipAmount.toFixed(2)}}
</span>
<span>实收小费：
{{item.IncomeTipAmount.toFixed(2)}}
</span>
<span>成本：
{{item.CostMoney.toFixed(2)}}
</span>
......
src/components/orderCommon/productOrderList.vue
View file @ 5acb8f4a
<style>
@import "../../assets/css/newTravelManager.css";
.productQuerySearch {
width: 100%;
min-height: auto;
overflow: hidden;
padding: 0 0 20px 0;
}
.productQuerySearch li {
float: left;
font-size: 12px;
color: #666;
margin: 20px 0 0px 0;
}
.productQuerySearch li>span {
display: inline-block;
}
.productQuerySearch li span>em {
display: inline-block;
min-width: 60px;
text-align: right;
font-style: normal;
margin: 0 12px 0 0;
}
.productQuerySearch li:last-child {
position: fixed;
z-index: 50;
top: 36px;
right: 20px;
}
.productQuerySearch ul {
position: relative;
overflow: hidden;
}
.productQueryList {
width: 100%;
min-width: 1366px;
......@@ -308,52 +270,6 @@
margin: 0;
}
.elPopoverLayer {
padding: 0px 10px;
}
.elPopoverLayer p {
line-height: 34px;
font-size: 12px;
}
.elPopoverLayer p>i {
font-style: normal;
border: 1px solid #999;
padding: 0 3px;
font-size: 12px;
margin-right: 10px;
font-weight: bold;
color: #333;
}
.elPopoverLayer p>span {
display: inline-block;
width: 130px;
}
.elPopoverLayer p>span>b {
margin-left: 10px;
color: #2aaef2;
}
.superSearchLayer>p {
padding: 20px 0;
font-size: 14px;
color: #333;
font-weight: bold;
}
.superSearchLayer>div {
margin-top: 20px;
color: #666;
font-size: 12px;
}
.superSearchLayer>div>span {
margin: 0 15px 0 5px;
}
.pro_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
......
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