Commit f713f298 authored by liudong1993's avatar liudong1993
parents 33d95e17 3c4c29a9
...@@ -32,5 +32,6 @@ var AuthCode = { ...@@ -32,5 +32,6 @@ var AuthCode = {
S_CheckAllOrder:'s_CheckAllOrder', //查看所有订单 S_CheckAllOrder:'s_CheckAllOrder', //查看所有订单
F_EditDeleteGuest:"F_EditDeleteGuest",//修改删除旅客和名单权限 F_EditDeleteGuest:"F_EditDeleteGuest",//修改删除旅客和名单权限
LookPlatformAccountPwd:"LookPlatformAccountPwd",//查看平台账户密码权限 LookPlatformAccountPwd:"LookPlatformAccountPwd",//查看平台账户密码权限
OPRecoverySaleOrder:"op_RecoverySaleOrder",//op恢复销售取消订单权限
}; };
export default AuthCode; export default AuthCode;
\ No newline at end of file
...@@ -2534,21 +2534,20 @@ ...@@ -2534,21 +2534,20 @@
</div> </div>
<div <div
v-if="item.changePriceId>0&&(item.isOwn == 1 || IsSupperOrderEdit ||IsLookOrder || isUpdateOrder)" v-if="item.changePriceId>0&&(item.isOwn == 1 || IsSupperOrderEdit ||IsLookOrder || isUpdateOrder)"
style=" overflow:hidden;"> style=" overflow:hidden;margin-top:10px;">
<span style="color:red;">改价申请:</span> <span> 申请金额【<span <span style="color:red;">改价申请:</span> <span> {{item.changePriceTime}} 申请金额【<span
style="color:red;">{{item.changePriceMoney}}</span>元】{{item.changePriceReason}}</span> style="color:red;">{{item.changePriceMoney}}</span>元】{{item.changePriceReason}}</span>
<div style="text-align:right;" v-if="item.changePriceState==1">
待{{item.ChangePriceType=="2"?"OP":"主管"}}{{item.managerExamineName}}审核 <div style="text-align:right;" v-if="item.changePriceState==1"> 待{{item.ChangePriceType=="2"?"OP":"主管"}}{{item.managerExamineName}}审核 </div>
</div> <div style="text-align:right;" v-if="item.changePriceState==2">
<div style="text-align:right;" v-if="item.changePriceState==2"> 待{{item.ChangePriceType=="2"?"会计":"总经理"}}{{item.examineByName}}审核
待{{item.ChangePriceType=="2"?"会计":"总经理"}}{{item.examineByName}}审核 </div>
</div> <div style="text-align:right;" v-if="item.changePriceState==4" >
<div v-if="item.changePriceState==4" style="text-align:right;"> 已驳回
已驳回 {{item.examineTime}} </div>
</div> <div style="text-align:right;" v-if="item.changePriceState==3" >
<div v-if="item.changePriceState==3" style="text-align:right;"> 已通过
已通过 {{item.examineTime}} </div>
</div>
</div> </div>
</div> </div>
</td> </td>
......
...@@ -2354,8 +2354,8 @@ ...@@ -2354,8 +2354,8 @@
</p> </p>
</div> </div>
</div> </div>
<div v-if="childItem.GroupType == 2 &&childItem.QuotationUrl&&childItem.QuotationUrl!=''" style="color: red; cursor: pointer" <div v-if="childItem.GroupType == 2 &&childItem.QuotationUrl&&childItem.QuotationUrl!=''"
@click="seeBJD(childItem.QuotationUrl)"> style="color: red; cursor: pointer" @click="seeBJD(childItem.QuotationUrl)">
查看报价单 查看报价单
</div> </div>
<div v-if="childItem.AutoCouponId>-1">优惠券: <div v-if="childItem.AutoCouponId>-1">优惠券:
...@@ -2853,20 +2853,20 @@ ...@@ -2853,20 +2853,20 @@
</el-button> </el-button>
</el-popover> </el-popover>
</div> </div>
<div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;"> <div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;margin-top:10px;">
<span>改价申请: 申请金额【<span <span>改价申请: {{childItem.ChangePriceTime}}申请金额【<span
style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span> style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span>
<div style="text-align:right;" v-if="childItem.ChangePriceState==1"> <div style="text-align:right;" v-if="childItem.ChangePriceState==1">
待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核 待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核
</div> </div>
<div style="text-align:right;" v-if="childItem.ChangePriceState==2"> <div style="text-align:right;" v-if="childItem.ChangePriceState==2">
待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核 待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核
</div> </div>
<div v-if="childItem.ChangePriceState==4" style="text-align:right;"> <div v-if="childItem.ChangePriceState==4" style="text-align:right;">
已驳回 {{childItem.ExamineTime}} 已驳回 {{childItem.ExamineTime}}
</div> </div>
<div v-if="childItem.ChangePriceState==3" style="text-align:right;"> <div v-if="childItem.ChangePriceState==3" style="text-align:right;">
已通过 {{childItem.ExamineTime}} 已通过 {{childItem.ExamineTime}}
</div> </div>
</div> </div>
</div> </div>
...@@ -3218,14 +3218,11 @@ ...@@ -3218,14 +3218,11 @@
</td> </td>
<td class="RL-BTNlist" rowspan="2"> <td class="RL-BTNlist" rowspan="2">
<!--恢复订单--> <!--恢复订单-->
<el-button type="primary" v-if="EditBtn" style="background-color: #00c6ff; border-color: #00c6ff" <el-tooltip class="item" effect="dark" content="点击恢复订单" placement="top">
icon="iconfont icon-bianji-smal" @click="RecoverOrder(item)"></el-button> <el-button type="primary" v-if="EditBtn" style="background-color: #00c6ff; border-color: #00c6ff"
icon="iconfont icon-bianji-smal" @click="RecoverOrder(item)"></el-button>
</el-tooltip>
<el-button-group> <el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
style="display: none">
<el-button type="primary" style="background-color: #00c6ff; border-color: #00c6ff"
icon="iconfont icon-bianji-smal" @click="getDetail(item)"></el-button>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('fnc.rizhi')" placement="top-start" style="float: left"> <el-tooltip effect="dark" :content="$t('fnc.rizhi')" placement="top-start" style="float: left">
<el-popover width="230" trigger="click"> <el-popover width="230" trigger="click">
<div class="priceContentDiv"> <div class="priceContentDiv">
...@@ -4295,7 +4292,7 @@ ...@@ -4295,7 +4292,7 @@
date: "", date: "",
TCNUM: "", TCNUM: "",
TCID: 0, TCID: 0,
TeamType:0, TeamType: 0,
}, },
NowInfo: { NowInfo: {
DuringHoliday: "", DuringHoliday: "",
...@@ -4306,7 +4303,7 @@ ...@@ -4306,7 +4303,7 @@
date: "", date: "",
TCNUM: "", TCNUM: "",
TCID: 0, TCID: 0,
TeamType:0, TeamType: 0,
}, },
setMsg: { setMsg: {
Id: 0, Id: 0,
...@@ -6294,14 +6291,14 @@ ...@@ -6294,14 +6291,14 @@
this.beforeInfo.date = ""; this.beforeInfo.date = "";
this.beforeInfo.TCNUM = ""; this.beforeInfo.TCNUM = "";
this.beforeInfo.TCID = 0; this.beforeInfo.TCID = 0;
this.beforeInfo.TeamType=0; this.beforeInfo.TeamType = 0;
this.NowInfo.DuringHoliday = ""; this.NowInfo.DuringHoliday = "";
this.NowInfo.date = ""; this.NowInfo.date = "";
this.afterInfo.DuringHoliday = "无"; this.afterInfo.DuringHoliday = "无";
this.afterInfo.date = "无"; this.afterInfo.date = "无";
this.afterInfo.TCNUM = ""; this.afterInfo.TCNUM = "";
this.afterInfo.TCID = 0; this.afterInfo.TCID = 0;
this.afterInfo.TeamType=0; this.afterInfo.TeamType = 0;
this.LeaderInfoList.LeaderSchedule.forEach((item) => { this.LeaderInfoList.LeaderSchedule.forEach((item) => {
if (item.PositionType == 1) { if (item.PositionType == 1) {
if (item.TypeId == 0) { if (item.TypeId == 0) {
...@@ -6312,7 +6309,7 @@ ...@@ -6312,7 +6309,7 @@
this.beforeInfo.date = item.EndDate; this.beforeInfo.date = item.EndDate;
this.beforeInfo.TCNUM = item.TCNUM; this.beforeInfo.TCNUM = item.TCNUM;
this.beforeInfo.TCID = item.TCID; this.beforeInfo.TCID = item.TCID;
this.beforeInfo.TeamType=item.TeamType; this.beforeInfo.TeamType = item.TeamType;
} }
if (item.PositionType == 2) { if (item.PositionType == 2) {
this.NowInfo.DuringHoliday = this.NowInfo.DuringHoliday =
...@@ -6328,7 +6325,7 @@ ...@@ -6328,7 +6325,7 @@
this.afterInfo.date = item.StartDate; this.afterInfo.date = item.StartDate;
this.afterInfo.TCNUM = item.TCNUM; this.afterInfo.TCNUM = item.TCNUM;
this.afterInfo.TCID = item.TCID; this.afterInfo.TCID = item.TCID;
this.afterInfo.TeamType=item.TeamType; this.afterInfo.TeamType = item.TeamType;
} else { } else {
this.afterInfo.DuringHoliday = "无"; this.afterInfo.DuringHoliday = "无";
this.afterInfo.date = "无"; this.afterInfo.date = "无";
...@@ -6803,7 +6800,7 @@ ...@@ -6803,7 +6800,7 @@
}); });
}, },
GetAuth() { GetAuth() {
var actionCode = this.$AuthCode.EidtCoupon; var actionCode = this.$AuthCode.OPRecoverySaleOrder;
this.CheckUserAuth(actionCode, (res) => { this.CheckUserAuth(actionCode, (res) => {
if (res.data.resultCode == 1 && res.data.data == 1) { if (res.data.resultCode == 1 && res.data.data == 1) {
this.EditBtn = true; this.EditBtn = true;
......
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