Commit 2fdd304f authored by zhengke's avatar zhengke

修改样式

parent 52c24f98
...@@ -249,11 +249,10 @@ ...@@ -249,11 +249,10 @@
background-color: #dcebff; background-color: #dcebff;
} }
.groupTourOrder_remarks { .groupTourOrder_remarksBytuan {
font-size: 0px; font-size: 12px;
} }
/* .groupTourOrder_remarks>div>div:nth-child(1) {
.groupTourOrder_remarks>div>div:nth-child(1) {
float: left; float: left;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
...@@ -282,9 +281,9 @@ ...@@ -282,9 +281,9 @@
.groupTourOrder_remarks>div>div:nth-child(2)>i { .groupTourOrder_remarks>div>div:nth-child(2)>i {
font-size: 10px; font-size: 10px;
cursor: pointer; cursor: pointer;
} } */
.groupTourOrder_remarks>div::after { .groupTourOrder_remarksBytuan>div::after {
display: block; display: block;
clear: both; clear: both;
content: ""; content: "";
...@@ -2149,26 +2148,29 @@ ...@@ -2149,26 +2148,29 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div> <div>
<div><span>备注时间:{{item.rematksTime}} 备注:</span> <div style="width:95%;display:inline-block;">
<p> <div style="color:red;"><span>备注时间:{{item.rematksTime}}</span></div>
<span v-if="item.tsIdList.length>0">投诉单号: <div style="color:red;">
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" <p>
@click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ; 备注:<span v-if="item.tsIdList.length>0">投诉单号:
</span> <a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);"
<template> @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
<template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder"> </span>
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 <template>
{{item.platformOrder}};</span> {{item.remarks}} <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>
<!-- <template v-else> </p>
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>***** </div>
</template> -->
</template>
</p>
</div> </div>
<div> <div style="float:right;text-align: right;font-size: 12px;color: #e95252;">
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> --> <!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click"> <el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover"> <div class="groupTourOrder_remarks_popover">
...@@ -2188,9 +2190,9 @@ ...@@ -2188,9 +2190,9 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div> <div>
<div> <div style="color:red;">
<span>OP备注:</span> <span>OP备注:</span>
<p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p> <p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p>
</div> </div>
...@@ -2453,9 +2455,9 @@ ...@@ -2453,9 +2455,9 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div> <div>
<div><span>备注:</span> <div style="display:inline-block;width:95%;color:red;"><span>备注:</span>
<p> <p>
<span v-if="item.tsIdList.length>0">投诉单号: <span v-if="item.tsIdList.length>0">投诉单号:
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" <a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);"
...@@ -2469,7 +2471,7 @@ ...@@ -2469,7 +2471,7 @@
</template> </template>
</p> </p>
</div> </div>
<div> <div style="display:inline-block;">
<el-popover width="600" placement="bottom-end" trigger="click"> <el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover"> <div class="groupTourOrder_remarks_popover">
<div>历史备注</div> <div>历史备注</div>
...@@ -2487,7 +2489,7 @@ ...@@ -2487,7 +2489,7 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div> <div>
<div> <div>
<span>OP备注:</span> <span>OP备注:</span>
......
...@@ -1785,7 +1785,7 @@ ...@@ -1785,7 +1785,7 @@
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注时间:</span> <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> <span class="RL-remarkTitle">备注:</span>
<p class="RL-redType RL-remarkCon">{{item.Remarks}}</p> <p class="RL-redType RL-remarkCon">{{item.Remarks}}</p>
</div> </div>
...@@ -2105,7 +2105,7 @@ ...@@ -2105,7 +2105,7 @@
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注时间:</span> <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> <span class="RL-remarkTitle"> 备注:</span>
<p class="RL-redType RL-remarkCon"> <p class="RL-redType RL-remarkCon">
......
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