Commit 15032513 authored by Mac's avatar Mac

样式的修改和旅客名单的房间信息增加

parent 979e3470
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
margin-top: 30px; margin-top: 30px;
font-size: 12px; font-size: 12px;
min-width: 1200px; min-width: 1200px;
overflow-y: auto;
} }
.changInfo .resource-baseinfo { .changInfo .resource-baseinfo {
float: left; float: left;
...@@ -93,7 +94,7 @@ ...@@ -93,7 +94,7 @@
position: relative; position: relative;
top: 1px; top: 1px;
} }
.changInfo .re-img { .changInfo .re-img {
width: 140px; width: 140px;
height: 93px; height: 93px;
...@@ -151,7 +152,7 @@ ...@@ -151,7 +152,7 @@
border-radius: 10px; border-radius: 10px;
position: absolute; position: absolute;
text-align: center; text-align: center;
line-height: 93px; line-height: 93px;
top: 0; top: 0;
} }
.changInfo .reimg-add:hover .ad-one { .changInfo .reimg-add:hover .ad-one {
...@@ -242,12 +243,12 @@ ...@@ -242,12 +243,12 @@
.changInfo .el-form-item__label { .changInfo .el-form-item__label {
width: 100px; width: 100px;
} }
.changInfo .jiudianyouhuiDiv .el-form-item__label{ .changInfo .jiudianyouhuiDiv .el-form-item__label{
width: 72px; width: 72px;
font-size: 12px; font-size: 12px;
} }
.changInfo .el-form-item__error { .changInfo .el-form-item__error {
left: 100px; left: 100px;
} }
...@@ -390,4 +391,4 @@ ...@@ -390,4 +391,4 @@
outline: none; outline: none;
cursor: pointer; cursor: pointer;
border: 1px solid #e95252; border: 1px solid #e95252;
} }
\ No newline at end of file
This diff is collapsed.
...@@ -2012,14 +2012,14 @@ ...@@ -2012,14 +2012,14 @@
<div> <div>
<span>发票单据:</span> <span>发票单据:</span>
<span v-for="(item2,index2) in childItem.InvoiceApplyList" :key="index2"> <span v-for="(item2,index2) in childItem.InvoiceApplyList" :key="index2">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" <span v-if="item2.InvoiceApplyState === 6" class="groupTourOrder_tickets_blue"
@click="goIisDetail(item2.id)">{{item2.id}}</span> @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3" <span v-else-if="item2.InvoiceApplyState === 1 || item2.InvoiceApplyState === 3"
class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span> class="groupTourOrder_tickets_green" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " <span v-else-if="item2.InvoiceApplyState === 5 || item2.InvoiceApplyState === 4 "
class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span> class="groupTourOrder_tickets_red" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" <span v-else-if="item2.InvoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span> @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
</span> </span>
<span v-if="childItem.InvoiceApplyList.length===0" style="cursor: default;">暂无数据</span> <span v-if="childItem.InvoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
</div> </div>
......
...@@ -212,7 +212,10 @@ ...@@ -212,7 +212,10 @@
<td rowspan="2"> <td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p> <p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;text-decoration:underline;" :title="item.orderId" <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;text-decoration:underline;" :title="item.orderId"
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}</p> @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;text-decoration: none;display: inline-block;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" title="点击跳转到团控列表" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p> <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" title="点击跳转到团控列表" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" <p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''"
style="color:red">({{item.leaveStr}})</span></p> style="color:red">({{item.leaveStr}})</span></p>
......
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