Skip to content

S
SuperMan
Commit 60c60b5a authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 6b0355b1 bae8d011
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 32 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 60c60b5a
......@@ -738,6 +738,7 @@
color:blue;
display: block;
cursor: pointer;
width:60px;
}
.needfenshu{
margin-top: 10px;
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 60c60b5a
......@@ -249,11 +249,10 @@
background-color: #dcebff;
}
.groupTourOrder_remarks {
font-size: 0px;
.groupTourOrder_remarksBytuan {
font-size: 12px;
}
.groupTourOrder_remarks>div>div:nth-child(1) {
/* .groupTourOrder_remarks>div>div:nth-child(1) {
float: left;
display: flex;
align-items: flex-start;
......@@ -282,9 +281,9 @@
.groupTourOrder_remarks>div>div:nth-child(2)>i {
font-size: 10px;
cursor: pointer;
}
} */
.groupTourOrder_remarks>div::after {
.groupTourOrder_remarksBytuan>div::after {
display: block;
clear: both;
content: "";
......@@ -2150,26 +2149,29 @@
</td>
</tr>
<tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div>
<div><span>备注时间:{{item.rematksTime}} 备注：</span>
<p>
<span v-if="item.tsIdList.length>0">投诉单号：
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);"
@click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
</span>
<template>
<template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单
{{item.platformOrder}};</span> {{item.remarks}}
<div style="width:95%;display:inline-block;">
<div style="color:red;"><span>备注时间：{{item.rematksTime}}</span></div>
<div style="color:red;">
<p>
备注：<span v-if="item.tsIdList.length>0">投诉单号：
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);"
@click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
</span>
<template>
<template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单
{{item.platformOrder}};</span> {{item.remarks}}
</template>
<!-- <template v-else>
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>*****
</template> -->
</template>
<!-- <template v-else>
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>*****
</template> -->
</template>
</p>
</p>
</div>
</div>
<div>
<div style="float:right;text-align: right;font-size: 12px;color: #e95252;">
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
......@@ -2189,9 +2191,9 @@
</div>
</div>
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div>
<div>
<div style="color:red;">
<span>OP备注:</span>
<p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p>
</div>
......@@ -2455,9 +2457,9 @@
</td>
</tr>
<tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div>
<div><span>备注：</span>
<div style="display:inline-block;width:95%;color:red;"><span>备注：</span>
<p>
<span v-if="item.tsIdList.length>0">投诉单号：
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);"
......@@ -2471,7 +2473,7 @@
</template>
</p>
</div>
<div>
<div style="display:inline-block;">
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
<div>历史备注</div>
......@@ -2489,7 +2491,7 @@
</div>
</div>
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div>
<div>
<span>OP备注:</span>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 60c60b5a
......@@ -933,6 +933,7 @@
color:blue;
display: block;
cursor: pointer;
width:60px;
}
</style>
......@@ -1785,7 +1786,7 @@
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注时间:</span>
<p class="RL-redType RL-remarkCon">{{item.RematksTime}}</p>
<p class="RL-redType RL-remarkCon" style="margin-left:62px;">{{item.RematksTime}}</p>
<span class="RL-remarkTitle">备注:</span>
<p class="RL-redType RL-remarkCon">{{item.Remarks}}</p>
</div>
......@@ -2105,7 +2106,7 @@
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注时间:</span>
<p class="RL-redType RL-remarkCon">{{childItem.RematksTime}}</p>
<p class="RL-redType RL-remarkCon" style="margin-left:62px;">{{childItem.RematksTime}}</p>
<span class="RL-remarkTitle"> 备注:</span>
<p class="RL-redType RL-remarkCon">
......@@ -3354,7 +3355,7 @@
})
},
FyongLossOk: function () {
if(this.fanyongMsg.UnionExtraMoney==""){
if(this.fanyongMsg.UnionExtraMoney===""){
this.Error('请输入额外返佣金额');
return;
}
......
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