Skip to content

C
CRM
Commit d038384c authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 555269bd
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 28 deletions
src/components/customerManage/customerOrder.vue
View file @ d038384c
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
{ {
Name: "取消订单", Name: "取消订单",
Id: "1", Id: "1",
show: item.OrderStatus!=5?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false,
}, },
{ {
Name: "订单转交", Name: "订单转交",
...@@ -426,32 +426,32 @@ ...@@ -426,32 +426,32 @@
{ {
Name: "修改订单金额", Name: "修改订单金额",
Id: "3", Id: "3",
show: item.OrderStatus!=5?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&(item.TicketStatus==1||item.VisaStatus==1)?true:false,
}, },
{ {
Name: "修改出票状态", Name: "修改出票状态",
Id: "4", Id: "4",
show: item.OrderStatus!=5?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.TicketStatus<3?true:false,
}, },
{ {
Name: "修改出签状态", Name: "修改出签状态",
Id: "5", Id: "5",
show: item.OrderStatus!=5&&item.VisaStatus==1?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.VisaStatus==1?true:false,
}, },
{ {
Name: '订单收损', Name: '订单收损',
Id: '8', Id: '8',
show: true show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
}, },
{ {
Name: '收损完结', Name: '收损完结',
Id: '9', Id: '9',
show: item.OrderStatus==3||item.OrderStatus==4&&item.DueinMoney==0?true:false show: (item.OrderStatus==3||item.OrderStatus==4)&&item.DueinMoney==0&&item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
}, },
{ {
Name: '完结', Name: '订单完结',
Id: '6', Id: '6',
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false show: item.OrderStatus==1&&item.DueinMoney==0?true:false
}, },
{ {
Name: "操作日志", Name: "操作日志",
......
src/components/customerManage/myCustomerOrder.vue
View file @ d038384c
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
{ {
Name: "取消订单", Name: "取消订单",
Id: "1", Id: "1",
show: item.OrderStatus!=5?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false,
}, },
{ {
Name: "订单转交", Name: "订单转交",
...@@ -407,32 +407,32 @@ ...@@ -407,32 +407,32 @@
{ {
Name: "修改订单金额", Name: "修改订单金额",
Id: "3", Id: "3",
show: item.OrderStatus!=5?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&(item.TicketStatus==1||item.VisaStatus==1)?true:false,
}, },
{ {
Name: "修改出票状态", Name: "修改出票状态",
Id: "4", Id: "4",
show: item.OrderStatus!=5?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.TicketStatus<3?true:false,
}, },
{ {
Name: "修改出签状态", Name: "修改出签状态",
Id: "5", Id: "5",
show: item.OrderStatus!=5&&item.VisaStatus==1?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.VisaStatus==1?true:false,
}, },
{ {
Name: '订单收损', Name: '订单收损',
Id: '8', Id: '8',
show: true show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
}, },
{ {
Name: '收损完结', Name: '收损完结',
Id: '9', Id: '9',
show: item.OrderStatus==3||item.OrderStatus==4&&item.DueinMoney==0?true:false show: (item.OrderStatus==3||item.OrderStatus==4)&&item.DueinMoney==0&&item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
}, },
{ {
Name: '完结', Name: '订单完结',
Id: '6', Id: '6',
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false show: item.OrderStatus==1&&item.DueinMoney==0?true:false
}, },
{ {
Name: "操作日志", Name: "操作日志",
......
src/components/customerManage/orderList.vue
View file @ d038384c
...@@ -109,7 +109,8 @@ ...@@ -109,7 +109,8 @@
:class="item.TicketStatus==1?'grey': :class="item.TicketStatus==1?'grey':
(item.TicketStatus==2?'success': (item.TicketStatus==2?'success':
(item.TicketStatus==3?'error': (item.TicketStatus==3?'error':
(item.TicketStatus==4?'Black':'')))"> (item.TicketStatus==4?'cancel':
(item.TicketStatus==5?'Black':''))))">
{{item.TicketStatusName}} {{item.TicketStatusName}}
</span> </span>
<i v-if="item.TicketStatus!=1&&item.TicketVoucherList!=[]&&item.CancelVoucherList!=[]&&item.TicketStatusName!='无需机票'" class="cp iconfont iconpingzhengchaxun Credentials" <i v-if="item.TicketStatus!=1&&item.TicketVoucherList!=[]&&item.CancelVoucherList!=[]&&item.TicketStatusName!='无需机票'" class="cp iconfont iconpingzhengchaxun Credentials"
...@@ -136,7 +137,7 @@ ...@@ -136,7 +137,7 @@
(item.OrderStatus=='2'?'two': (item.OrderStatus=='2'?'two':
(item.OrderStatus=='3'?'three': (item.OrderStatus=='3'?'three':
(item.OrderStatus=='4'?'four': (item.OrderStatus=='4'?'four':
(item.OrderStatus=='5'?'five':''))))"> (item.OrderStatus=='5'?'five':(item.OrderStatus=='6'?'six':'')))))">
<span>{{item.OrderStatusName}}</span> <span>{{item.OrderStatusName}}</span>
</div> </div>
</td> </td>
...@@ -1214,6 +1215,9 @@ export default { ...@@ -1214,6 +1215,9 @@ export default {
color: #F2C037; color: #F2C037;
} }
.tatusText.cancel {
color: #FFB300;
}
.tatusText.Black { .tatusText.Black {
color: Black; color: Black;
} }
...@@ -1804,4 +1808,8 @@ li { ...@@ -1804,4 +1808,8 @@ li {
color: rgb(197,225,165); color: rgb(197,225,165);
background-color: rgba(97,225,165,.2); background-color: rgba(97,225,165,.2);
} }
.Order-list-Status.six{
color: rgb(102,187,106);
background-color: rgba(102,187,106,.2);
}
</style> </style>
src/components/guestManagement/Agreement.vue
View file @ d038384c
...@@ -1072,7 +1072,7 @@ ...@@ -1072,7 +1072,7 @@
{ {
Name: "取消订单", Name: "取消订单",
Id: "1", Id: "1",
show: item.OrderStatus!=5?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false,
}, },
{ {
Name: "订单转交", Name: "订单转交",
...@@ -1082,33 +1082,32 @@ ...@@ -1082,33 +1082,32 @@
{ {
Name: "修改订单金额", Name: "修改订单金额",
Id: "3", Id: "3",
show: item.OrderStatus!=5?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&(item.TicketStatus==1||item.VisaStatus==1)?true:false,
}, },
{ {
Name: "修改出票状态", Name: "修改出票状态",
Id: "4", Id: "4",
show: item.OrderStatus!=5?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.TicketStatus<3?true:false,
}, },
{ {
Name: "修改出签状态", Name: "修改出签状态",
Id: "5", Id: "5",
show: item.OrderStatus!=5&&item.VisaStatus==1?true:false, show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.VisaStatus==1?true:false,
}, },
{ {
Name: '订单收损', Name: '订单收损',
Id: '8', Id: '8',
show: true show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
}, },
{ {
Name: '收损完结', Name: '收损完结',
Id: '9', Id: '9',
show: item.OrderStatus==3||item.OrderStatus==4&&item.DueinMoney==0?true:false show: (item.OrderStatus==3||item.OrderStatus==4)&&item.DueinMoney==0&&item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
}, },
{ {
Name: '完结', Name: '订单完结',
Id: '6', Id: '6',
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false show: item.OrderStatus==1&&item.DueinMoney==0?true:false
}, },
{ {
Name: "操作日志", Name: "操作日志",
......
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