Commit d1efcbc9 authored by 罗超's avatar 罗超
parents 865cd590 ad143b41
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
} }
.hotelmanagement .btnList { .hotelmanagement .btnList {
margin-top: 16px; margin-top: 12px;
text-align: center; text-align: center;
} }
...@@ -330,9 +330,9 @@ ...@@ -330,9 +330,9 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div style="padding-left:15px"> <div style="padding-left:15px;padding-top:5px;">
<i style="top:2px" class="iconfont icon-renyuanguanli"></i> <i style="top:2px" class="iconfont icon-renyuanguanli"></i>
<span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}/</span> <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
{{item.UpdateTimeStr}} {{item.UpdateTimeStr}}
</div> </div>
<div class="btnList"> <div class="btnList">
......
...@@ -335,9 +335,9 @@ ...@@ -335,9 +335,9 @@
<div>{{$t('restaurant.res_advanceDays')}}</div> <div>{{$t('restaurant.res_advanceDays')}}</div>
</div> </div>
</div> </div>
<div style="padding:0 0 10px 15px;margin-top: -5px;"> <div style="padding:0 0 15px 15px;margin-top: -5px;">
<i class="iconfont icon-renyuanguanli"></i> <i class="iconfont icon-renyuanguanli"></i>
<span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}/</span> <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
{{item.UpdateTimeStr}} {{item.UpdateTimeStr}}
</div> </div>
......
...@@ -621,7 +621,8 @@ ...@@ -621,7 +621,8 @@
.RL-opremarkTitle { .RL-opremarkTitle {
display: inline-block; display: inline-block;
float: left; float: left;
width: 53px; width: 78px;
text-align: right;
white-space: nowrap; white-space: nowrap;
font-size: 14px; font-size: 14px;
} }
...@@ -2362,7 +2363,8 @@ ...@@ -2362,7 +2363,8 @@
<div class="clearfix RL-MARK" style="width:75%;float:left;"> <div class="clearfix RL-MARK" style="width:75%;float:left;">
<span class="RL-opremarkTitle">{{$t('Operation.Op_remark')}}:</span> <span class="RL-opremarkTitle">{{$t('Operation.Op_remark')}}:</span>
<span class="RL-redType RL-remarkCon" <span class="RL-redType RL-remarkCon"
style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span> style="width:74%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
<div><span style="display:inline-block;">备注人/时间</span>:{{childItem.OPRemarkUpdateName}}&nbsp;&nbsp;{{childItem.OPRemarkUpdateTimeStr}}</div>
</div> </div>
<template v-if="isShow==true"> <template v-if="isShow==true">
<div style="float:right;" v-if="childItem.IsCanClear==0"> <div style="float:right;" v-if="childItem.IsCanClear==0">
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
.scenicSpotList .resourceList { .scenicSpotList .resourceList {
width: 215px; width: 215px;
height: 240px;
background-color: #fff; background-color: #fff;
border: 1px dashed #ededed; border: 1px dashed #ededed;
border-radius: 4px; border-radius: 4px;
...@@ -150,7 +149,7 @@ ...@@ -150,7 +149,7 @@
} }
.scenicSpotList .btnList { .scenicSpotList .btnList {
margin-top: 10px; padding:10px 0 20px 0;
text-align: center; text-align: center;
} }
...@@ -313,11 +312,10 @@ ...@@ -313,11 +312,10 @@
<el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
<div class="hotelTitle">{{item.Name}}</div> <div class="hotelTitle">{{item.Name}}</div>
</el-tooltip> </el-tooltip>
<div style="padding-left:15px"> <div style="padding-left:15px;margin:10px 0;">
<i style="top: 1px;position: relative;" class="iconfont icon-renyuanguanli"></i> <i style="top: 1px;position: relative;" class="iconfont icon-renyuanguanli"></i>
<span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}/</span> <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
{{item.UpdateTimeStr}} {{item.UpdateTimeStr}}
</div> </div>
<div class="btnList"> <div class="btnList">
<button @click="goUrl('scenicSpotInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button> <button @click="goUrl('scenicSpotInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
......
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