Commit 546f48be authored by 华国豪's avatar 华国豪 🙄

酒店订单关联团

parent 177a4af6
...@@ -137,10 +137,7 @@ ...@@ -137,10 +137,7 @@
color: #000000; color: #000000;
text-decoration: underline; text-decoration: underline;
} }
.SalesHotelOrder i.icon-sousuo,.icon-zhuanhuan1{background-color: #47BF8C;}
.SalesHotelOrder i.icon-sousuo:hover{background-color: #66bb97}
.SalesHotelOrder i.icon-sousuo:active{background-color: #35ab79}
.SalesHotelOrder i.Logo_iconfont{width: 30px;height: 30px;display: inline-block;color: white !important;border-radius: 50%;text-align: center;line-height: 30px;margin-right: 10px;cursor: pointer;outline: none;}
</style> </style>
<template> <template>
...@@ -296,6 +293,7 @@ ...@@ -296,6 +293,7 @@
<tr> <tr>
<th>订单号</th> <th>订单号</th>
<th>第三方订单号</th> <th>第三方订单号</th>
<th>团号</th>
<th>房间数</th> <th>房间数</th>
<th>总额</th> <th>总额</th>
<th>实收</th> <th>实收</th>
...@@ -304,11 +302,9 @@ ...@@ -304,11 +302,9 @@
<th>待收金额</th> <th>待收金额</th>
<th>订单状态</th> <th>订单状态</th>
<th>创建时间</th> <th>创建时间</th>
<th>入住时间</th> <th>入住/离店时间</th>
<th>离店时间</th>
<th>取消费用</th> <th>取消费用</th>
<th>客户名称</th> <th>客户信息</th>
<th>客户手机号</th>
<th>创建人</th> <th>创建人</th>
<th>结束时间</th> <th>结束时间</th>
<th>操作</th> <th>操作</th>
...@@ -317,36 +313,41 @@ ...@@ -317,36 +313,41 @@
<tr> <tr>
<td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}</td> <td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}</td>
<td>{{item.ThirdOrderNo}}</td> <td>{{item.ThirdOrderNo}}</td>
<td><span class="cursorpointer text-decoration" @click="GotoUrl(item.TCNUM)" v-if="item.TCID">{{item.TCNUM}}({{item.TCID}})</span></td>
<td>{{item.Number}}</td> <td>{{item.Number}}</td>
<td>{{item.TotalPrice}}</td> <td>{{item.TotalPrice}}</td>
<td>{{item.Income}}</td> <td>{{item.Income}}</td>
<td>{{item.RedEnvelopeMoney}}</td> <td>{{item.RedEnvelopeMoney}}</td>
<td>{{item.DiscountMoney}}</td> <td>{{item.DiscountMoney}}</td>
<td>{{item.DueinMoney}}</td> <td>{{item.DueinMoney}}</td>
<td> <td>
<span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span> <span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span>
</td> </td>
<td>{{item.CreateDateStr}}</td> <td>{{item.CreateDateStr}}</td>
<td>{{item.CheckInStr}}</td> <td>{{item.CheckInStr}}-{{item.CheckOutStr}}</td>
<td>{{item.CheckOutStr}}</td>
<td>{{item.CancelFee}}</td> <td>{{item.CancelFee}}</td>
<td>{{item.CustomerName}}</td> <td>{{item.CustomerName}}/{{item.CustomerPhone}}</td>
<td>{{item.CustomerPhone}}</td>
<td>{{item.CreateByStr}}</td> <td>{{item.CreateByStr}}</td>
<td>{{item.EndTime}}</td> <td>{{item.EndTime}}</td>
<td> <td>
<el-row> <el-row>
<el-tooltip class="item" effect="dark" content="付款" placement="top-start"> <el-button-group>
<el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" circle></el-button> <el-tooltip class="item" effect="dark" content="付款" placement="top-start">
</el-tooltip> <el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" ></el-button>
<el-tooltip class="item" v-if="item.ShowBtn" effect="dark" content="取消" placement="top-start"> </el-tooltip>
<el-button type="danger" icon="iconfont icon-quxiao1" circle @click="cancelHTorder(item.ThirdOrderNo)"></el-button> <el-tooltip class="item" v-if="item.ShowBtn" effect="dark" content="取消订单" placement="top-start">
</el-tooltip> <el-button type="info" icon="iconfont icon-quxiao1" @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
<el-tooltip class="item" effect="dark" content="详情" placement="top-start"> </el-tooltip>
<i class="Logo_iconfont iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)"></i> <el-tooltip class="item" effect="dark" content="确定" placement="top-start">
</el-tooltip> <el-button type="success" icon="iconfont icon-duigou" @click="queren(1, item.OrderID)" ></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消确认" placement="top-start">
<el-button type="info" icon=" iconfont icon-quxiao1" @click="queren(0, item.OrderID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="关联团" placement="top-start">
<el-button type="warning" icon="iconfont icon-guanlian" @click="TCID = '',GLOrderID = item.OrderID,dialogFormVisible = true"></el-button>
</el-tooltip>
</el-button-group>
</el-row> </el-row>
</td> </td>
</tr> </tr>
...@@ -395,7 +396,32 @@ ...@@ -395,7 +396,32 @@
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p> <p>{{$t("active.ld_noData")}}</p>
</div> </div>
<el-dialog title="请选择团号" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie">
<el-form label-width="110px">
<el-form-item label="团号">
<el-select
v-model="TCID"
filterable
remote
reserve-keyword
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethodTCNum"
:loading="loading2">
<el-option
v-for="item in searchList"
:key="item.TCID"
:label="item.TCNUM"
:value="item.TCID">
<span style="float: left">{{ item.TCNUM }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="dialogFormVisible=false,GLOrderID = ''">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="querenGL">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total> :page-size=msg.pageSize :total=total>
</el-pagination> </el-pagination>
...@@ -418,6 +444,8 @@ export default { ...@@ -418,6 +444,8 @@ export default {
CStartTime:'', CStartTime:'',
CEndTime:'' CEndTime:''
}, },
TCID: '',
GLOrderID: '',
total:0, total:0,
currentPage: 1, currentPage: 1,
loading:false, loading:false,
...@@ -490,10 +518,71 @@ export default { ...@@ -490,10 +518,71 @@ export default {
DepartmentList:[], DepartmentList:[],
EmployeeList:[], EmployeeList:[],
//统计快 //统计快
TotalMsg:[] TotalMsg:[],
searchList: [],
loading2: false,
dialogFormVisible: false,
}; };
}, },
methods: { methods: {
GotoUrl(TCNUM) {
this.$router.push({
path: "TravelControlList",
query: {
tcmun: TCNUM,
blank: 'y',
tab: "团控查询",
}
});
},
querenGL(){
this.apipost("dmc_post_get_RelevanceTCID",{ TCID: this.TCID, OrderID: this.GLOrderID },res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
this.dialogFormVisible = false
}
},err => {});
},
closeChangeMachie(done) { // 弹=窗口关闭
done();
},
remoteMethodTCNum(query) {
if (query !== ''||this.addShow) {
this.loading2 = true;
this.apipost("InvoiceApply_get_GetPriceList",{ TCNUM:query },res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
this.loading2 = false;
}
},err => {});
} else {
this.searchList = [];
this.loading2 = false;
}
},
queren(type, OrderID){
let text = type == 1 ? '确认' : '取消'
this.$confirm('确定“'+ text +'”订单?', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('dmc_post_get_UpdateOrderCanClear',{OrderID: OrderID, IsCanClear: type},res=>{
if(res.data.resultCode==1){
this.Success(res.data.message);
this.getList();
}else{
this.Error(res.data.message);
}
},err=>{})
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('ios.yi') + this.$t('pub.cancelBtn')
});
});
},
goOrderDetails(ID){ goOrderDetails(ID){
this.$router.push({ this.$router.push({
name: 'OpHotelOrderDetail', name: 'OpHotelOrderDetail',
...@@ -518,7 +607,7 @@ export default { ...@@ -518,7 +607,7 @@ export default {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let EmployeeId = userInfo.EmployeeId; let EmployeeId = userInfo.EmployeeId;
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
if(x.CreateBy==EmployeeId||EmployeeId==1){ if((x.CreateBy == EmployeeId ||EmployeeId == 1 || EmployeeId == 5) && x.IsCanOrder){
x.ShowBtn = true; x.ShowBtn = true;
}else{ }else{
x.ShowBtn = false; x.ShowBtn = false;
......
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