Skip to content

S
SuperMan
Commit cca2d1a9 authored by 黄奎's avatar 黄奎
Browse files
Options

新增价格审核

parent 3ae203d0
Show whitespace changes
Inline Side-by-side
Showing with 299 additions and 12 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ cca2d1a9
......@@ -1544,6 +1544,9 @@
<el-dropdown-item @click.native="CopyTripAndFeature(item, 2)">
{{ $t("objFill.v101.xiugaictriqi") }}
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
价格变更
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -1565,10 +1568,6 @@
{{ item.OutGroupAuditRemark }} {{ item.OutGroupAuditDate }}
</div>
</div>
<!-- <div class="clearfix TCL-redType" v-if="item.ProductRecommend">
<div class="TCL_remarkTitle">{{$t('Operation.Op_bentuanMaidian')}}：</div>
<div class="TCL_Content">{{item.ProductRecommend}}</div>
</div> -->
<div class="clearfix TCL-redType" v-if="item.OPRemark">
<div class="TCL_remarkTitle">{{ $t("Operation.Op_duiwaiRemark") }}：</div>
<div class="TCL_Content">{{ item.OPRemark }}</div>
......@@ -1619,6 +1618,33 @@
</div>
</div>
</div>
<div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
<span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}</span>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 1">
<span
style="color: blue; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 2">
<span
style="color: green; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 3">
<span
style="color: red; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
<span style="color: red">{{ $t("objFill.yuanyin") }}:
<template v-if="item.PriceChangeModel.MAContent">
{{item.PriceChangeModel.MAContent}}
</template>
<template v-else>
{{item.PriceChangeModel.AuditContent}}
</template>
</span>
</template>
</div>
</div>
</div>
</li>
</ul>
<div class="noData" v-show="queryMsg.noData">
......@@ -1807,6 +1833,39 @@
</el-button>
</div>
</div>
<!--价格变更-->
<div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="changePriceMsg.isShowChangePrice">
<div class="combottomTitle">
价格变更申请
</div>
<el-form label-width="100px">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="变更原因" prop="Remark">
<el-input v-model="changePriceMsg.ChangeRemark" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer">
&nbsp;
<el-button size="small" @click="changePriceMsg.isShowChangePrice = false">
{{ $t("pub.cancelBtn") }}
</el-button>
<el-button type="primary" size="small" :loading="saveLoading" @click="SetChangePrice">
{{ $t("pub.sureBtn") }}
</el-button>
</div>
</div>
<div v-if="dialog.show">
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
......@@ -2029,6 +2088,15 @@
copyType: "",
CurrentTCNUM: "",
},
//价格变更
changePriceMsg: {
isShowChangePrice: false,
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
ChangePriceStatus: 1,
ChangeRemark: "",
},
flightStatus: [{
Id: 0,
Name: this.$t("pub.unlimitedSel"),
......@@ -2374,7 +2442,7 @@
//获取TCID
clickAirticket(item) {
this.updateAirticketObj.TCID = item.TCID;
console.log(" this.updateAirticketObj",item.TCID, this.updateAirticketObj)
console.log(" this.updateAirticketObj", item.TCID, this.updateAirticketObj)
},
//开启散客机票
openAirticket() {
......@@ -3249,6 +3317,32 @@
);
});
},
ckChangePrice(item) {
this.changePriceMsg.isShowChangePrice = true;
this.changePriceMsg.TCID = item.TCID;
},
//价格变更
SetChangePrice() {
var that = this;
that.apipost(
'travel_post_SetTravelPriceChange',
that.changePriceMsg,
(res) => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.changePriceMsg.isShowChangePrice = false;
that.changePriceMsg.NewB2BPrice = "";
that.changePriceMsg.NewB2BPrice = "";
that.changePriceMsg.TCID = 0;
that.getControlList();
} else {
that.Error(res.data.message);
}
},
(err) => {}
);
},
//签证op设置
ckOPInfo(item) {
this.VisaOPMsg.VisaShow = true;
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ cca2d1a9
......@@ -1046,6 +1046,9 @@
</el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}}
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
价格变更
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -1105,6 +1108,33 @@
</div>
</div>
</div>
<div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
<span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}</span>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 1">
<span
style="color: blue; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 2">
<span
style="color: green; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 3">
<span
style="color: red; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
<span style="color: red">{{ $t("objFill.yuanyin") }}:
<template v-if="item.PriceChangeModel.MAContent">
{{item.PriceChangeModel.MAContent}}
</template>
<template v-else>
{{item.PriceChangeModel.AuditContent}}
</template>
</span>
</template>
</div>
</div>
</div>
</li>
</ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
......@@ -1232,6 +1262,38 @@
</el-button>
</div>
</div>
<!--价格变更-->
<div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="changePriceMsg.isShowChangePrice">
<div class="combottomTitle">
价格变更申请
</div>
<el-form label-width="100px">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="变更原因" prop="Remark">
<el-input v-model="changePriceMsg.ChangeRemark" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer">
&nbsp;
<el-button size="small" @click="changePriceMsg.isShowChangePrice = false">
{{ $t("pub.cancelBtn") }}
</el-button>
<el-button type="primary" size="small" :loading="saveLoading" @click="SetChangePrice">
{{ $t("pub.sureBtn") }}
</el-button>
</div>
</div>
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<div v-if="dialog.show">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
......@@ -1446,6 +1508,15 @@
copyType: "",
CurrentTCNUM: "",
},
//价格变更
changePriceMsg: {
isShowChangePrice: false,
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
ChangePriceStatus: 1,
ChangeRemark: "",
},
//更新可售机票数量
updateAirticketObj: {
TCID: 0,
......@@ -1678,6 +1749,33 @@
);
});
},
ckChangePrice(item) {
this.changePriceMsg.isShowChangePrice = true;
this.changePriceMsg.TCID = item.TCID;
},
//价格变更
SetChangePrice() {
var that = this;
that.apipost(
'travel_post_SetTravelPriceChange',
that.changePriceMsg,
(res) => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.changePriceMsg.isShowChangePrice = false;
that.changePriceMsg.NewB2BPrice = "";
that.changePriceMsg.NewB2CPrice = "";
that.changePriceMsg.ChangeRemark = "";
that.changePriceMsg.TCID = 0;
that.getControlList();
} else {
that.Error(res.data.message);
}
},
(err) => {}
);
},
//签证op设置
ckOPInfo(item) {
this.VisaOPMsg.VisaShow = true;
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ cca2d1a9
......@@ -454,7 +454,8 @@
</p>
<p class="travelnowrap">
<span>{{$t('Airticket.Air_StartTime')}}</span>
<span class="go_date">{{item.StartDate}}(<font style="color:red;font-weight:bold;">{{item.StartDateWeekStr}}</font>)</span>
<span class="go_date">{{item.StartDate}}(<font style="color:red;font-weight:bold;">
{{item.StartDateWeekStr}}</font>)</span>
<template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop">
......@@ -870,6 +871,9 @@
</el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}}
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
价格变更
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -922,6 +926,33 @@
</div>
</div>
</div>
<div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
<span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}</span>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 1">
<span
style="color: blue; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 2">
<span
style="color: green; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 3">
<span
style="color: red; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
<span style="color: red">{{ $t("objFill.yuanyin") }}:
<template v-if="item.PriceChangeModel.MAContent">
{{item.PriceChangeModel.MAContent}}
</template>
<template v-else>
{{item.PriceChangeModel.AuditContent}}
</template>
</span>
</template>
</div>
</div>
</div>
</li>
</ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
......@@ -1035,6 +1066,38 @@
</el-button>
</div>
</div>
<!--价格变更-->
<div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="changePriceMsg.isShowChangePrice">
<div class="combottomTitle">
价格变更申请
</div>
<el-form label-width="100px">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="变更原因" prop="Remark">
<el-input v-model="changePriceMsg.ChangeRemark" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer">
&nbsp;
<el-button size="small" @click="changePriceMsg.isShowChangePrice = false">
{{ $t("pub.cancelBtn") }}
</el-button>
<el-button type="primary" size="small" :loading="saveLoading" @click="SetChangePrice">
{{ $t("pub.sureBtn") }}
</el-button>
</div>
</div>
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
......@@ -1243,6 +1306,14 @@
copyType: "",
CurrentTCNUM: "",
},
changePriceMsg: {
isShowChangePrice: false,
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
ChangePriceStatus: 1,
ChangeRemark: "",
},
saveLoading: false, //保存loading防止重复提交
//当前登录用户信息
CurrentUserInfo: {},
......@@ -1422,6 +1493,33 @@
);
});
},
ckChangePrice(item) {
this.changePriceMsg.isShowChangePrice = true;
this.changePriceMsg.TCID = item.TCID;
},
//价格变更
SetChangePrice() {
var that = this;
that.apipost(
'travel_post_SetTravelPriceChange',
that.changePriceMsg,
(res) => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.changePriceMsg.isShowChangePrice = false;
that.changePriceMsg.NewB2BPrice = "";
that.changePriceMsg.NewB2CPrice = "";
that.changePriceMsg.ChangeRemark="";
that.changePriceMsg.TCID = 0;
that.getControlList();
} else {
that.Error(res.data.message);
}
},
(err) => {}
);
},
//提示信息(type=1酒店推送,type=2订车推送)
TipsContent(item, type) {
let resultStr = '';
......
src/components/dmc/manager/changePriceAudit.vue
View file @ cca2d1a9
......@@ -85,14 +85,14 @@
<template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}</template>
</template>
</el-table-column>
<el-table-column prop="B2BPrice" :label="$t('Operation.Op_fellow')" width="130">
<el-table-column prop="B2BPrice" :label="$t('Operation.Op_tradePrice')" width="130">
<template slot-scope="scope">
<span>
{{scope.row.B2BPrice}}=><font style="color:red">{{scope.row.NewB2BPrice}}</font>
</span>
</template>
</el-table-column>
<el-table-column prop="B2CPrice" :label="$t('Operation.Op_direct')" width="130">
<el-table-column prop="B2CPrice" :label="$t('Operation.Op_directPrice')" width="130">
<template slot-scope="scope">
<span>
{{scope.row.B2CPrice}}=><font style="color:red;">{{scope.row.NewB2CPrice}}</font>
......@@ -170,10 +170,7 @@
Id: 0
}
],
BranchAuditStateType: [{
Name: this.$t('advmanager.v_all'),
Id: -1
},
BranchAuditStateType: [
{
Name: this.$t('objFill.dsh'),
Id: 1
......
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