Skip to content

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

no message

parent ca989eaa
Hide whitespace changes
Inline Side-by-side
Showing with 422 additions and 15 deletions
src/components/myOrdersAllType/components/OrderList.vue
View file @ 5e451a9c
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<p style="font-size: 18px;display: flex;align-items: center;"><el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag><span>{{scope.row.OrderId}}</span> </p> <p class="cursor-pointer c059FF6 fz18 row-c" @click.stop="goDetails(scope.row)"><el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag><span>{{scope.row.OrderId}}</span> </p>
<p>下单日期：{{scope.row.CreateTimeStr}}</p> <p>{{scope.row.CreateTimeStr}}</p>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -26,7 +26,9 @@ ...@@ -26,7 +26,9 @@
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<p style="font-size: 14px;">{{scope.row.TCNUM}}</p> <p class=" fz14"
:class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
@click.stop="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p>
<p>出发日期：{{scope.row.StartDate}}</p> <p>出发日期：{{scope.row.StartDate}}</p>
</div> </div>
</template> </template>
...@@ -70,7 +72,7 @@ ...@@ -70,7 +72,7 @@
label="总金额" label="总金额"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.Money}}({{scope.row.CurrencyName}}) {{scope.row.Money}}&ensp;({{scope.row.CurrencyName}})
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -121,13 +123,13 @@ ...@@ -121,13 +123,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
label="操作" label="操作"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" @click="goDetails(scope.row)">查看</el-button> <el-button size="mini" type="primary" @click="goDetails(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</template> </template>
<script> <script>
...@@ -253,6 +255,16 @@ ...@@ -253,6 +255,16 @@
} }
}, },
methods: { methods: {
goTuanDetails(row){
this.$router.push({
name: 'groupTourOrderByTuan',
query: {
id: row.tcid,
tcmun: row.TCNUM,
blank: "y",
}
});
},
goDetails(row){ goDetails(row){
let data = [{ let data = [{
path: "", path: "",
...@@ -787,5 +799,392 @@ ...@@ -787,5 +799,392 @@
}; };
</script> </script>
<style></style> <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;
}
.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.activeB {
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 {
width: 100px;
height: 50%;
display: flex;
justify-content: center;
}
.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;
}
</style>
\ No newline at end of file
src/components/myOrdersAllType/components/allList.vue
View file @ 5e451a9c
...@@ -246,20 +246,20 @@ ...@@ -246,20 +246,20 @@
<span class="groupTourOrder_count_green">实收： <span class="groupTourOrder_count_green">实收：
{{item.Income.toFixed(2)}} {{item.Income.toFixed(2)}}
</span> </span>
<span class="color_red_order">退款： <span>退款：
{{item.Refund.toFixed(2)}} {{item.Refund.toFixed(2)}}
</span> </span>
<span class="color_red_order">手续费： <span>手续费：
{{item.PlatformTax.toFixed(2)}} {{item.PlatformTax.toFixed(2)}}
</span> </span>
<span class="color_red_order">成本： <span>成本：
{{item.CostMoney.toFixed(2)}} {{item.CostMoney.toFixed(2)}}
</span> </span>
<span class="color_red_order" <span
:style="{'color':item.DueInMoney>0?'red':''}">待收： :class="{'color_red_order':item.DueInMoney>0}">待收：
<span>{{item.DueInMoney.toFixed(2)}}</span> <span>{{item.DueInMoney.toFixed(2)}}</span>
</span> </span>
<span class="color_red_order">报名数： <span>报名数：
{{item.GuestNum}}人 {{item.GuestNum}}人
</span> </span>
</p> </p>
...@@ -576,8 +576,8 @@ ...@@ -576,8 +576,8 @@
if(this.Title!='销售'){ if(this.Title!='销售'){
this.getEmployee() this.getEmployee()
} }
this.msg.StartTime = this.getBeforeDate(31, new Date()) this.msg.StartTime = this.getBeforeDate(31, new Date())
this.msg.EndTime = this.getBeforeDate(0, new Date()) this.msg.EndTime = this.getBeforeDate(0, new Date())
this.DatelistBM = [new Date(this.msg.StartTime),new Date()] this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
// this.GetOrderStatusEnumList() // this.GetOrderStatusEnumList()
this.GetTicketStatusEnumList() this.GetTicketStatusEnumList()
......
src/router/config.js
View file @ 5e451a9c
...@@ -3307,6 +3307,14 @@ export default { ...@@ -3307,6 +3307,14 @@ export default {
title: '今日订单' title: '今日订单'
}, },
}, },
{ //OP 今日订单
path: '/erpCustomerOrderDayOP',
name: 'erpCustomerOrderDayOP',
component: resolve => require(['@/components/myOrdersAllType/erpCustomerOrderDayOP'], resolve),
meta: {
title: '我的订单'
},
},
{ // 销售 散卖机票订单 { // 销售 散卖机票订单
path: '/BulkAirTicketOrders', path: '/BulkAirTicketOrders',
name: 'BulkAirTicketOrders', name: 'BulkAirTicketOrders',
......
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