Skip to content

S
SuperMan
Commit 40d434d2 authored by 沈良进's avatar 沈良进
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 07eee204 217ebd26
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 635 deletions
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ 40d434d2
......@@ -202,8 +202,6 @@
data() {
return {
dataObj:{},
objNew:{},
outerVisible:false,
Month: moment().format("YYYY-MM"),
msg: {
pageIndex: 1,
......@@ -478,13 +476,6 @@
JSON.stringify(data);
window.open(href);
},
GenerateScale(item){
// if(!item.WageReId){
// return
// }
this.objNew = item
this.outerVisible = true
},
GetCommissionPeroidsList() { //期数下拉
this.apipost(
"sellcommission_GetTYSaleCommissionPeriodsList",{},res => {
......
src/components/FinancialModule/TradeCommission/commissionDialog.vue
View file @ 40d434d2
<style scoped>
.row {
display: flex;
}
.row-c {
display: flex;
align-items: center;
}
.column {
display: flex;
flex-direction: column;
}
.column-jac {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.column-ac {
display: flex;
flex-direction: column;
align-items: center;
}
.wrap {
flex-wrap: wrap;
}
.justify-sb {
justify-content: space-between;
}
.justify-c {
justify-content: center;
}
.justify-e {
justify-content: flex-end;
align-items: flex-end;
}
.flex-g {
flex-grow: 1;
}
.flex-s {
flex-shrink: 0;
}
.align-c {
align-items: center;
}
.cblack {
color: black;
}
.cf {
color: #ffffff;
}
.c9e {
color: #9e9e9e;
}
.c20C997 {
color: #20c997;
}
.c02C854 {
color: #02c854;
}
.cff9800 {
color: #ff9800;
}
.groupTourOrderSearchTable tr:first-child td:first-child,.groupTourOrderSearchTable tbody tr:last-child{
border-bottom: 0;
}
.cF1416C {
color: #f1416c;
}
.cF57A98 {
color: #f57a98;
}
.c04C8C8 {
color: #04c8c8;
}
.c059FF6 {
color: #059ff6;
}
.c3FC4FF {
color: #3fc4ff;
}
.fz10 {
font-size: 10px;
}
.fz11 {
font-size: 11px;
}
.fz12 {
font-size: 12px;
}
.fz13 {
font-size: 13px;
}
.fz14 {
font-size: 14px;
}
.fz15 {
font-size: 15px;
}
.fz16 {
font-size: 16px;
}
.fz17 {
font-size: 17px;
}
.fz18 {
font-size: 18px;
}
.fbold {
font-weight: bold;
}
.ml {
margin-left: 10px;
}
.mr {
margin-right: 10px;
}
.mt {
margin-top: 10px;
}
.mt20 {
margin-top: 20px;
}
.mb {
margin-bottom: 10px;
}
.mb20 {
margin-bottom: 20px;
}
.mx {
margin-left: 10px;
margin-right: 10px;
}
.mx5 {
margin-left: 5px;
margin-right: 5px;
}
.mb5 {
margin-bottom: 5px;
}
.py {
padding: 15px 0;
}
.py5 {
padding: 5px 0;
}
.px5 {
padding: 0 5px;
}
.px15 {
padding: 0 15px;
}
.pa15 {
padding: 15px;
}
.py20 {
padding: 20px 0;
}
.pb5 {
padding: 0 0 5px 0;
}
.pa {
padding: 10px 20px;
}
.pa20 {
padding: 20px;
}
.pt20 {
padding: 20px 0;
}
.borderD {
border-bottom: 1px dashed #dddddd;
}
.bgf {
background: #ffffff;
}
.bgf5 {
background: #f5f5f5;
}
.bgE8F5E9 {
background: #e8f5e9;
}
.bgD9F3FF {
background: #d9f3ff;
}
.bgFAEAED {
background: #faeaed;
}
.bj {
background: #ffffff;
}
.bjFFF3E0 {
background: #FFF3E0;
}
.radius5 {
border-radius: 5px;
}
.cursor-pointer {
cursor: pointer;
}
.relative {
position: relative;
}
.absolute {
position: absolute;
}
.left0 {
left: 0;
}
.right0 {
right: 0;
}
.top0 {
top: 0;
}
.bottom0 {
bottom: 0;
}
.left20 {
left: 020px;
}
.right20 {
right: 20px;
}
.top20 {
top: 20px;
}
.bottom20 {
bottom: 20px;
}
.text-center {
text-align: center;
}
.orderType {
padding: 3px 15px;
border-radius: 3px;
background: #f57a98;
margin-right: 15px;
}
.orderType.active {
background: #4dd0e1;
}
.orderType.activeNo {
background: #E95252;
}
.copy {
display: inline-block;
padding: 3px 15px;
border-radius: 3px;
margin-left: 20px;
}
.copy:hover {
background: #f5f5f5;
}
.see-rec div {
padding: 1px 5px;
border-radius: 3px;
}
.see {
border: 1px solid #04c8c8;
}
.seeLK {
border: 1px solid #059ff6;
}
.see:hover {
background-color: rgba(4, 200, 200, 0.1);
}
.rec {
border: 1px solid #04c8c8;
background-color: rgba(4, 200, 200, 1);
}
.rec:hover {
border: 1px solid rgba(4, 200, 200, 0.9);
background-color: rgba(4, 200, 200, 0.9);
}
.cancel:hover {
background-color: #f3dce2;
}
.confirm:hover {
background-color: #dcedc8;
}
.change:hover {
background-color: #d7e9f3;
}
.change1:hover {
background-color: #dcedc8;
}
.orderop {
text-align: center;
}
.orderop div {
display: flex;
justify-content: center;
padding: 0 10px;
margin: 5px 0;
}
.RoomList div {
border-bottom: 1px solid #e7e7e7;
}
.RoomList div:last-child {
border: 0;
}
.el-table {
font-size: 13px;
}
.shezhifrom {
position: relative;
}
.shebox {
position: absolute;
top: 0;
left: -100px;
display: none;
}
.shezhifrom:hover .shebox {
display: block;
}
.flexOne-form-bj h3 {
font-size: 18px;
color: black;
padding: 0 0 20px 0;
font-weight: 400;
}
.flexOne-type {
display: flex;
align-items: center;
padding: 0 0 20px 0;
}
.flexOne-type b {
font-size: 13px;
width: 100px;
flex-shrink: 0;
}
.flexOne-type div {
display: flex;
}
.flexOne-description {
padding: 15px 15px;
border-radius: 5px;
background: #E1F5FE;
margin-bottom: 20px;
}
.flexOne-description b {
font-size: 14px;
}
.flexOne-description p {
font-size: 12px;
color: #4C5759;
padding: 10px 0 0 0;
}
.flexOne-infor-box b {
font-size: 13px;
}
.infor-list {
display: flex;
flex-direction: column;
}
.list-title {
padding: 20px 0;
border-bottom: 1px dashed #eeeeee;
color: #7E8299;
font-size: 13px;
}
.list-title,
.list-centent {
display: flex;
flex-wrap: wrap;
margin-top: 20px;
}
.infor-list li {
width: 25%;
}
.list-centent li {
width: 33.33%;
}
.list-centent.active li {
width: 25%;
}
/deep/.el-table tr td:first-child {
border-bottom: 0;
}
/deep/.el-table tr:last-child td {
border-bottom: 1px solid #EBEEF5;
}
/deep/.el-table tr td {
border-bottom: 1px solid #EBEEF5;
}
/deep/.el-table .el-table__cell{
padding: 5px 0;
}
.CM_look {
padding: 4px !important;
position: relative;
top: 1px;
}
.opUl li {
display: inline-block;
margin: 10px 15px 10px 0;
}
.domesticCommissionUser .opUl li input{
height: 34px !important;
}
.domesticCommissionUser .singeRowTable{
/* position: absolute; */
}
.domesticCommissionUser .singeRowTable tr td {
padding: 8px 5px;
}
.domesticCommissionUser .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
.text-fixed{
/* height: 100%;
position: absolute;
left: 0;
top: 0; */
}
.cursor-p{
cursor: pointer;
}
.cursor-p:hover{
color: #409EFF;
}
.ITUDWageMoney-box{
margin-top: 20px;
margin-bottom: 10px;
}
.ITUDschedule-Box-box{
display: flex;
flex-direction: row;
justify-content: space-between;
}
.ITUDschedule-box{
flex: 1;
display: flex;
flex-direction: column;
}
.ITUD-title{
margin-top: 10px;
margin-bottom: 10px;
}
.progress-box{
flex: 1;
display: flex;
flex-direction: row;
}
.relative-position{
flex: 1;
margin-right: 0;
position: relative;
}
/deep/.relative-position .el-progress-bar__outer{
border-radius: 0 !important;
}
/deep/.relative-position .el-progress-bar__inner{
border-radius: 0 !important;
}
.ITUD-text-box{
position: relative;
}
.ITUD-text{
position: absolute;
z-index: 999;
color: red;
}
.rate-box {
position: absolute;
top: 30px;
left: 50%;
transform: translateX(-50%);
color: #000;
z-index: 9;
display: flex;
flex-wrap: wrap;
justify-content: center;
}
.sanjiao {
width: 0;
height: 0;
margin-left: 5%;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
border-bottom: 3px solid #CACACA;
}
.rate {
min-width: 20px;
padding: 2px 6px;
background-color: #CACACA !important;
display: flex;
justify-content: center;
align-items: center;
color: #666666;
font-size: 0.62vw;
font-family: PingFang SC;
border-radius: 7px;
line-height:12px;
white-space:nowrap;
}
.active-rate{
background-color: #FF7262 !important;
color: #FFFFFF !important;
}
.clickCp{
cursor: pointer;
color: #2961fe;
}
</style>
<template>
<div>
<span class="c059FF6"
:class="{'cursor-pointer':objNew.createTime>=new Date('2023-04-01').Format('yyyy-MM-dd')
<div style="float: left;">
<span class="cF1416C"
:class="{'cursor-pointer':(objNew.createTime&&objNew.createTime>=new Date('2023-04-01').Format('yyyy-MM-dd'))
||(objNew.createDate&&objNew.createDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))
||(objNew.CreateTime&&objNew.CreateTime>=new Date('2023-04-01').Format('yyyy-MM-dd'))
||(objNew.CreateTime&&objNew.CreateTime>=new Date('2023/04/01').Format('yyyy/MM/dd'))
&&objNew.commissionMoney>0}"
@click="objNew.createTime>=new Date('2023-04-01').Format('yyyy-MM-dd')?DetailsOfRoyalty():''">
￥<span class="fz15 fbold">{{ moneyFormat(objNew.commissionMoney) }}</span>
@click="(objNew.createTime&&objNew.createTime>=new Date('2023-04-01').Format('yyyy-MM-dd'))
||(objNew.createDate&&objNew.createDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))
||(objNew.CreateTime&&objNew.CreateTime>=new Date('2023-04-01').Format('yyyy-MM-dd'))
||(objNew.CreateTime&&objNew.CreateTime>=new Date('2023/04/01').Format('yyyy/MM/dd'))?DetailsOfRoyalty():''">
￥<span class="fz15 fbold">{{ objNew.commissionMoney?moneyFormat(objNew.commissionMoney):objNew.SellCommission }} {{objNew.commissionCurrency?objNew.commissionCurrency:''}}</span>
</span>
<el-dialog width="1000px" title="提成详情" :visible.sync="outerVisible" center>
<div class="flexOne domesticCommissionUser">
......@@ -640,7 +39,7 @@
<div style="margin-bottom: 20px;display: flex;justify-content: space-between;">
<div>
<span>总人数：{{dataObj.TotalNum}}</span>
<span>总提成：{{dataObj.TotalMoney}}</span>
<span style="margin-left: 20px;">总提成：{{dataObj.TotalMoney}}</span>
</div>
<input type="button" class="normalBtn" value="查看提成明细"
@click="goUrl" />
......@@ -751,6 +150,7 @@
},
methods: {
goUrl(){
console.log(this.objNew,'----')
this.outerVisible = false
this.$router.push({
path: 'TradeTicketUserDetails',
......
src/components/Hotel/reservation/OrderList.vue
View file @ 40d434d2
......@@ -509,6 +509,11 @@
<span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template>
</el-table-column>
<el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
<template slot-scope="scope">
<commissionDialog :objNew="item"></commissionDialog>
</template>
</el-table-column>
<!-- <el-table-column label="手配费应收" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{
......@@ -902,8 +907,9 @@
import offset from '../../public/offset.vue';
import more from '../../public/more.vue';
import correlationOP from './correlationOP.vue';
import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
export default {
components: { offset, more, correlationOP },
components: { offset, more, correlationOP,commissionDialog },
props: ["OrderList","pagesTitle"],
data() {
return {
......
src/components/SalesModule/groupTourOrder.vue
View file @ 40d434d2
......@@ -1715,7 +1715,9 @@
<p>{{ $t("restaurant.res_oderTime") }}：{{ item.createDate }}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<p v-if="item.commissionMoney" style="color: red">
{{ $t("salesModule.Commission") }}：{{ item.commissionMoney }} {{item.commissionCurrency}}
<span style="float: left;">{{ $t("salesModule.Commission") }}：</span>
<commissionDialog :objNew="item"></commissionDialog>
<!-- {{ item.commissionMoney }} {{item.commissionCurrency}} -->
</p>
<p v-else-if="item.latestCommissionMoney" style="color: red">
{{ $t("salesModule.Commission") }}：{{
......@@ -2425,6 +2427,7 @@
import payURL1 from "../commonPage/payURL1.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
export default {
data() {
......@@ -2741,6 +2744,7 @@
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan,
commissionDialog
},
filters: {
priceFormat(value) {
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 40d434d2
......@@ -1482,7 +1482,10 @@
<p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.Commission')}}：{{item.commissionMoney}}
<p v-if='item.commissionMoney' style="color:red">
<span style="float: left;">{{$t('salesModule.Commission')}}：</span>
<commissionDialog :objNew="item"></commissionDialog>
<!-- {{item.commissionMoney}} -->
</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">
{{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}</p>
......@@ -1855,6 +1858,7 @@
import payURL1 from '../commonPage/payURL1.vue'
import tripDownLoadCommon from '../commonPage/TripDownLoadCommon.vue'
import updateSalesMan from '../commonPage/updateSalesMan.vue'
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
export default {
data() {
......@@ -2229,7 +2233,8 @@
payurlItem: payURL,
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan
updateSalesMan: updateSalesMan,
commissionDialog
},
filters: {
priceFormat(value) {
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ 40d434d2
......@@ -556,9 +556,10 @@
<template slot-scope="scope">
<template>
<p class="CreateByName-text" v-if="scope.row.DepartTime">出发：<span>{{scope.row.DepartTime}}</span></p>
<p class="CreateByName-text" v-if="scope.row.OrderStatus == 5">完结：<span>{{scope.row.FinishTime}}</span></p>
<p class="CreateByName-text" v-if="scope.row.OrderStatus == 6">完结：<span >{{scope.row.LossFinishTime}}</span></p>
<p class="CreateByName-text Commission cp" v-if="scope.row.Commission" @click="commissionDetails(scope.row)">提成：<span>{{scope.row.Commission}}</span></p>
<p class="CreateByName-text" v-else-if="scope.row.OrderStatus == 5">完结：<span>{{scope.row.FinishTime}}</span></p>
<p class="CreateByName-text" v-else-if="scope.row.OrderStatus == 6">完结：<span >{{scope.row.LossFinishTime}}</span></p>
<p class="CreateByName-text Commission cp" v-else-if="scope.row.Commission" @click="commissionDetails(scope.row)">提成：<span>{{scope.row.Commission}}</span></p>
<template v-else>-</template>
</template>
</template>
</el-table-column>
......@@ -602,6 +603,11 @@
<span :class="{'cF1416C':scope.row.DueinMoney>0}">{{ scope.row.DueinMoney }}</span>
</template>
</el-table-column>
<el-table-column v-if="item.commissionMoney&&item.commissionMoney>0" label="提成" style="background:#EAEAEA">
<template slot-scope="scope">
<commissionDialog :objNew="scope.row"></commissionDialog>
</template>
</el-table-column>
<el-table-column label="出票状态" style="background:#EAEAEA">
<template slot-scope="scope">
<span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''"
......@@ -865,8 +871,9 @@
</template>
<script>
import offset from '../../public/offset.vue';
import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
export default {
components: { offset },
components: { offset,commissionDialog },
props: ["OrderList","pagesTitle"],
data() {
return {
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ 40d434d2
......@@ -576,6 +576,11 @@
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template>
</el-table-column>
<el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
<template slot-scope="scope">
<commissionDialog :objNew="item"></commissionDialog>
</template>
</el-table-column>
</el-table>
<div class="row justify-sb mt mb20">
<div class="column px15 bgf5 radius5 flex-g pa relative">
......@@ -836,8 +841,9 @@
<script>
import offset from '../../../public/offset.vue';
import correlationOP from '../../../Hotel/reservation/correlationOP.vue';
import commissionDialog from "../../../FinancialModule/TradeCommission/commissionDialog"
export default {
components: { offset,correlationOP },
components: { offset,correlationOP,commissionDialog },
props: ["OrderList","pagesTitle"],
data() {
return {
......
src/components/scenicSpot/reservation/OrderList.vue
View file @ 40d434d2
......@@ -616,6 +616,11 @@
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template>
</el-table-column>
<el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
<template slot-scope="scope">
<commissionDialog :objNew="item"></commissionDialog>
</template>
</el-table-column>
</el-table>
<div class="row justify-sb mt mb20">
......@@ -987,9 +992,10 @@
<script>
import offset from '../../public/offset.vue';
import correlationOP from '../../Hotel/reservation/correlationOP.vue';
import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
export default {
components: {
offset,correlationOP
offset,correlationOP,commissionDialog
},
props: ["OrderList", "pagesTitle"],
data() {
......
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