Skip to content

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

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

parents b211ce51 08ea275b
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 6 deletions
src/components/SalesModule/enrollTotal.vue
View file @ a5079724
......@@ -171,6 +171,7 @@
<tbody v-for="(item,index) in list" :key="index">
<tr>
<td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
@click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
......@@ -207,7 +208,8 @@
<td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="userId==1">
<button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">修改业务员</button>
</td>
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ a5079724
......@@ -225,6 +225,7 @@
<tbody v-for="(item,index) in list" :key="index">
<tr>
<td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
@click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
......@@ -264,7 +265,8 @@
<td>{{item.platformTax}}</td>
<td>{{moneyFormat(item.zaiTuMoney)}}</td>
<td class="weiShou">{{moneyFormat(item.weiShouMoney)}}</td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
</tr>
<tr>
<td colspan="8" class="groupTourOrder_remarks" style="height: 40px;">
......
src/components/SalesModule/groupTourOrder.vue
View file @ a5079724
......@@ -1216,6 +1216,7 @@
<tbody v-for="(item,index) in list" :key="index">
<tr>
<td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" @click="goUrlX('产品查询','productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
......@@ -1304,7 +1305,8 @@
<td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td width="120">
<!--{{item.confirmFileList}}-->
<!--<span>确认函</span>-->
......@@ -1352,7 +1354,12 @@
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'>
<span v-if="item.isChargeLossOrders==1">恢复收损</span>
<span v-else>设为收损</span>
</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
</div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' icon="iconfont icon-more"></el-button>
</el-popover>
......@@ -1532,6 +1539,7 @@ export default {
isOrder:'1'
},
IsUnion: 2,
IsChargeLossOrders:0,
addMsg: {
OrderId: "0",
TCID: "0",
......@@ -1893,6 +1901,35 @@ export default {
this.$message.info("已取消！");
});
},
setChargeLoss(obj) {
let confirmC="确定设为收损单?";
if(obj.isChargeLossOrders==1){
confirmC="确定恢复收损单?";
}
this.$confirm(confirmC, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost(
"sellorder_post_RemoveChargeLossOrders",
{ OrderId: obj.orderId },
res => {
if (res.data.resultCode == 1) {
this.$message.success("操作成功！");
this.getList();
}else{
this.$message.error(res.data.message);
}
},
err => {}
);
})
.catch(() => {
this.$message.info("取消！");
});
},
getUnionTravelPrice(obj, type) {
let msg = {};
msg.TCID = obj.TCID;
......@@ -2090,6 +2127,7 @@ export default {
this.endTime = obj.backDate;
this.getMinPrice(obj.orderId);
this.addMsg.OrderId = obj.orderId;
this.IsChargeLossOrders=obj.isChargeLossOrders;
this.apipost(
"sellorder_post_GetOrderEntity",
{ ID: obj.orderId },
......@@ -2624,8 +2662,12 @@ export default {
Number(this.addMsg.ESeatNum) +
Number(this.addMsg.FSeatNum)
) {
if(this.IsChargeLossOrders==1){
}else{
this.$message.warning("人数和机位数不相等！");
return;
}
}
if (
Number(this.addMsg.AirticketNum) +
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ a5079724
......@@ -1407,6 +1407,7 @@
<tr>
<td rowspan="3" style="position:relative;">
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<div>
{{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
......@@ -1514,7 +1515,8 @@
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder" :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span>
<span v-else>******</span>
</td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td class="fz12">
<div v-if="item.orderState===3">
<span v-if="item.waitYNum>0" style="margin: 0 5px 0 0;">{{item.waitYNum}}(Y)</span>
......@@ -1568,6 +1570,10 @@
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
<div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'>
<span v-if="item.isChargeLossOrders==1">恢复收损</span>
<span v-else>设为收损</span>
</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
</div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' icon="iconfont icon-more"></el-button>
......@@ -2439,6 +2445,35 @@ export default {
this.$message.info("已取消！");
});
},
setChargeLoss(obj) {
let confirmC="确定设为收损单?";
if(obj.isChargeLossOrders==1){
confirmC="确定恢复收损单?";
}
this.$confirm(confirmC, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost(
"sellorder_post_RemoveChargeLossOrders",
{ OrderId: obj.orderId },
res => {
if (res.data.resultCode == 1) {
this.$message.success("操作成功！");
this.getList();
}else{
this.$message.error(res.data.message);
}
},
err => {}
);
})
.catch(() => {
this.$message.info("取消！");
});
},
getUnionTravelPrice(obj, type) {
let msg = {};
msg.TCID = obj.TCID;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ a5079724
......@@ -1534,6 +1534,7 @@
<tr>
<td rowspan="3" style="position:relative;">
<div v-if="childItem.IsReturnIntermodal==1 || childItem.IsIntermodal==1" class="order_union">联</div>
<p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p>
<!--@click="goUrlX('groupTourOrderByTuan',childItem.TCID,childItem.TCNUM)"-->
<div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId">{{childItem.OrderId}}
</div>
......@@ -1618,7 +1619,8 @@
<td class="nowrap">{{childItem.PlatformTax}}</td>
<td class="nowrap">{{childItem.ZaiTuMoney}}</td>
<td class="nowrap"><span :class="{color_red_order:childItem.DueInMoney!==childItem.PreferPrice}">{{childItem.DueInMoney}}</span></td>
<td class="fz12"><span :class="{'RL-redType':childItem.statsstr=='候补'}">{{childItem.statsstr}}</span></td>
<td v-if="childItem.IsChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
<td v-else class="fz12"><span :class="{'RL-redType':childItem.statsstr=='候补'}">{{childItem.statsstr}}</span></td>
<td>
<div @click="goOpenUrl('confirmationOrder',childItem.OrderId)" style="cursor:pointer;">电子确认函</div>
<span v-if='childItem.ConfirmFileList.length>0' @click="downLoadFile(childItem.ConfirmFileList)">确认函下载</span>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ a5079724
......@@ -196,6 +196,7 @@
<tbody v-for="(item,index) in OrderList" :key="index">
<tr>
<td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p
class="fbold over_ellipsis"
style="width: 100%;cursor:pointer;"
......@@ -245,7 +246,8 @@
<td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td>
<p
class="over_ellipsis"
......
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