Skip to content

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

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

parents c34dce31 a9ed1cc2
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 76 deletions
src/components/Hotel/HotelWorkList.vue
View file @ f924330c
<style>
.HotelWorkList .has-gutter tr th, .el-table th.is-leaf{
background-color: #EAEAEA!important;
}
.HotelWorkList .HW_hotelDialog{
width:900px;
}
.HotelWorkList .Hw_tableOne{
width:100%;
height:40px;
background-color:#EAEAEA;
}
.HotelWorkList .Hw_tableOne th{
text-align: center;
}
</style>
<template>
<div>
<div class="HotelWorkList">
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
......@@ -22,7 +39,7 @@
</div>
<template v-if="isShow">
<el-table :data="dataList" style="width:100%" border v-loading='loading' height="700">
<el-table-column fixed label="酒店名称" min-width="180">
<el-table-column fixed label="酒店名称" min-width="180" style="background:#EAEAEA">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.Hotel)">
{{scope.row.HotelName}}
......@@ -68,76 +85,84 @@
<p>{{$t("active.ld_noData")}}</p>
</div>
</template>
<el-dialog custom-class='Tp_hotelDialog' :title="'【'+CurrentDateStr+'】团期酒店信息列表'" :visible.sync="outerVisible" center>
<table v-loading="changeLoading">
<tr>
<th width="60" style="text-align:center;">
选择
</th>
<th width="145" style="text-align:center;">
团号
</th>
<th width="140" style="text-align:center;">
地接团号
</th>
<th width="120" style="text-align:center;">
酒店
</th>
<th width="120" style="text-align:center;">
更换酒店
</th>
<th width="100" style="text-align:center;">
OP状态
</th>
<th width="100" style="text-align:center;">
地接状态
</th>
</tr>
<tr v-for="(hItem,hIndex) in MyDataList">
<td style="text-align:center;">
<el-checkbox :checked="hItem.IsChecked" @change="ChangeStatus(hItem)"></el-checkbox>
</td>
<td style="text-align:center;">
{{hItem.TCNUM}}<br />({{hItem.TCID}})
</td>
<td style="text-align:center;">
{{hItem.DMCNum}}
</td>
<td style="text-align:left;">
{{hItem.OldHotelName}}
</td>
<td style="text-align:left;">
{{hItem.NewHotelName}}
</td>
<td style="text-align:center;">
<template v-if="hItem.OPState==1">
<a style="color:green">OP-指定</a>
</template>
<template v-else-if="hItem.OPState==2">
<a style="color:red">OP-暂定</a>
</template>
</td>
<td style="text-align:center;">
<template v-if="hItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else-if="hItem.DMCState==2">
<a style="color:red">地接-暂定</a>
</template>
<template v-else-if="hItem.DMCState==0">
<a style="color:red">地接-未操作</a>
</template>
</td>
</tr>
<tfoot>
<el-dialog custom-class='HW_hotelDialog' :title="'【'+CurrentDateStr+'】团期酒店信息列表'" :visible.sync="outerVisible" center>
<table class="Hw_tableOne">
<tr>
<td colspan="7" style="text-align:center;">
<input type="button" class="normalBtn" value="保存" @click="SaveHotelOrder()" />
<input type="button" class="normalBtn" value="关闭" @click="CloseHotel()" />
</td>
<th width="60">
选择
</th>
<th width="145">
团号
</th>
<th width="150">
地接团号
</th>
<th width="125">
酒店
</th>
<th width="125">
更换酒店
</th>
<th width="80">
OP状态
</th>
<th width="90">
地接状态
</th>
</tr>
</tfoot>
</table>
<div style="height:450px;overflow:auto;">
<table v-loading="changeLoading" style="width:100%;">
<tr v-for="(hItem,hIndex) in MyDataList">
<td style="text-align:center;" width="60">
<el-checkbox :checked="hItem.IsChecked" @change="ChangeStatus(hItem)"></el-checkbox>
</td>
<td style="text-align:center;" width="145">
{{hItem.TCNUM}}<br />({{hItem.TCID}})
</td>
<td style="text-align:center;" width="150">
{{hItem.DMCNum}}
</td>
<td style="text-align:left;" width="125">
{{hItem.OldHotelName}}
</td>
<td style="text-align:left;" width="125">
{{hItem.NewHotelName}}
</td>
<td style="text-align:center;" width="80">
<template v-if="hItem.OPState==1">
<a style="color:green">OP-指定</a>
</template>
<template v-else-if="hItem.OPState==2">
<a style="color:red">OP-暂定</a>
</template>
</td>
<td style="text-align:center;" width="90">
<template v-if="hItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else-if="hItem.DMCState==2">
<a style="color:red">地接-暂定</a>
</template>
<template v-else-if="hItem.DMCState==0">
<a style="color:red">地接-未操作</a>
</template>
</td>
</tr>
<!-- <tfoot>
<tr>
<td colspan="7" style="text-align:center;">
<input type="button" class="normalBtn" value="保存" @click="SaveHotelOrder()" />
<input type="button" class="normalBtn" value="关闭" @click="CloseHotel()" />
</td>
</tr>
</tfoot> -->
</table>
</div>
<div style="text-align:center;margin-top:20px;">
<input type="button" class="normalBtn" value="保存" @click="SaveHotelOrder()" />
<input type="button" class="normalBtn" value="关闭" @click="CloseHotel()" />
</div>
</el-dialog>
</div>
</template>
......@@ -206,6 +231,7 @@
}
});
that.MyDataList = nArray;
console.log(that.MyDataList,'MydataList');
} else {
that.Error(res.data.message);
}
......
src/components/LeaderManagement/leaderPerformance.vue
View file @ f924330c
......@@ -83,7 +83,7 @@
.guidPerformance .bottomList {
float: left;
width: 495px;
width: 500px;
height: 230px;
border: 1px solid #E6E6E6;
border-radius: 4px;
......@@ -117,8 +117,11 @@
width: 265px;
position: relative;
text-align: center;
margin-right:90px;
}
.guidPerformance .championList:last-child{
margin-right:0;
}
.guidPerformance .runnderUp {
width: 118px;
height: 118px;
......@@ -394,7 +397,7 @@
自费人均
<i></i>
</li>
<li :class="msg.Type==11?'Day_active':''" @click="msg.Type=11,getStatis()" title="自费次数">
<li :class="msg.Type==11?'Day_active':''" style="width:108px;" @click="msg.Type=11,getStatis()" title="自费次数">
自费次数
<i></i>
</li>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ f924330c
......@@ -2638,11 +2638,11 @@
<button class="hollowFixedBtn" @click="FyongLoading=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='w350' title="修改OP备注" :visible.sync="zhuanLoading" center :before-close="initOPRemarkMsg">
<el-dialog custom-class='w450' title="修改OP备注" :visible.sync="zhuanLoading" center :before-close="initOPRemarkMsg">
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px">
<el-form-item label="OP备注：" class="w280">
<el-input type="textarea" :rows="2" v-model="OPRemarkMsg.OP_Remarks"></el-input>
<el-form label-width="80px">
<el-form-item label="OP备注：" class="w400">
<el-input type="textarea" :rows="8" v-model="OPRemarkMsg.OP_Remarks"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......
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