Skip to content

S
SuperMan
Commit 06fc5ad4 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 874b3a17 9e29c7da
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 292 additions and 210 deletions
src/components/administrative/model/ChangeThePriceMessage.vue 0 → 100644
View file @ 06fc5ad4
<template>
<el-dialog custom-class='PingFangSC' title="订单改价提醒" :visible.sync="outerVisibleNot" center
:before-close="closeChangeMachie" width="1100px">
<div style="margin-top: 20px;">
<p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;">订单改价列表</p>
<el-table
border
ref="multipleTable"
:data="ChangeThePriceData"
style="width: 100%"
:default-sort="{ prop: 'null', order: 'null' }"
:sort-by="[
'Money',
'Income',
'PreferTipAmount',
'PlatformTax',
'Refund',
'CostMoney',
'OrderProfit',
'DueInMoney'
]"
>
<el-table-column
width="200"
prop="CreateTimeStr"
label="订单Id"
show-overflow-tooltip
>
<template slot-scope="scope">
<div>
<p
class="cursor-pointer c059FF6 fz18 row-c"
@click="goDetails(scope.row)"
>
<el-tag style="margin-right: 5px;" size="mini">{{
scope.row.OrderTypeName
}}</el-tag>
<span>{{ scope.row.OrderId }}</span>
</p>
<p>{{ scope.row.CreateTimeStr }}</p>
</div>
</template>
</el-table-column>
<el-table-column
width="200"
prop="CreateTimeStr"
label="团号"
show-overflow-tooltip
>
<template slot-scope="scope">
<div>
<p
class=" fz14"
:class="{ 'cursor-pointer c059FF6': scope.row.OrderType == 2 }"
@click="scope.row.OrderType == 2 ? goTuanDetails(scope.row) : ''"
>
{{ scope.row.TCNUM }}
</p>
<p>出发日期：{{ scope.row.StartDate }}</p>
<p v-if="scope.row.OrderType == 2 && scope.row.Status >= 0">
{{
scope.row.Status == 1
? "未结团"
: scope.row.Status == 2
? "已结团 "
: scope.row.Status == 5
? "待结团审核"
: ""
}}{{ scope.row.Status == 2 ? scope.row.OutGroupAuditDate : "" }}
</p>
</div>
</template>
</el-table-column>
<el-table-column label="客人" show-overflow-tooltip>
<template slot-scope="scope">
<span>
{{ scope.row.GuestName }}
</span>
</template>
</el-table-column>
<el-table-column prop="SaleName" label="销售"> </el-table-column>
<el-table-column prop="LureEmpName" label="引流"> </el-table-column>
<el-table-column label="商品名称" show-overflow-tooltip>
<template slot-scope="scope">
<div
style="max-width: 100px;overflow: hidden;text-overflow: ellipsis"
>
{{ scope.row.Name }}
</div>
</template>
</el-table-column>
<el-table-column label="商品详情" show-overflow-tooltip>
<template slot-scope="scope">
<div
style="max-width: 100px;overflow: hidden;text-overflow: ellipsis"
>
{{ scope.row.Description }}
</div>
</template>
</el-table-column>
<el-table-column
sortable
prop="Money"
label="总金额"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ scope.row.Money }}&ensp;({{ scope.row.CurrencyName }})
</template>
</el-table-column>
<el-table-column sortable prop="Income" label="实收"> </el-table-column>
<el-table-column
sortable
prop="PlatformTax"
label="手续费"
min-width="100"
>
</el-table-column>
<el-table-column sortable prop="Refund" label="退款"> </el-table-column>
<!-- <el-table-column sortable prop="CostMoney" label="成本" >
</el-table-column> -->
<el-table-column sortable prop="DueInMoney" label="待收">
<template slot-scope="scope">
<span :class="{ red: scope.row.DueInMoney > 0 }">{{
scope.row.DueInMoney
}}</span>
</template>
</el-table-column>
<el-table-column
sortable
prop="OrderProfit"
label="预期利润"
min-width="110"
>
<template slot-scope="scope">
<span :class="{ red: scope.row.OrderProfit > 0 }">{{
scope.row.OrderProfit
}}</span>
</template>
</el-table-column>
<el-table-column sortable prop="DiscountsMoney" label="优惠">
</el-table-column>
<el-table-column
prop="Money"
label="申请金额"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
<span> {{ scope.row.ApplyForMoney }}</span>
</template>
</el-table-column>
<el-table-column
prop="ApplyForReason"
label="申请理由"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ scope.row.ApplyForReason }}
</template>
</el-table-column>
<el-table-column
prop="ApplyForState"
label="改价状态"
show-overflow-tooltip
>
<template slot-scope="scope">
<span
>{{
scope.row.ApplyForState == 1
? "待审核"
: scope.row.ApplyForState == 2
? "已通过"
: scope.row.ApplyForState == 3
? "已拒绝"
: ""
}}
</span>
</template>
</el-table-column>
</el-table>
</div>
<div v-if="ChangeThePriceData.length==0" style="padding: 40px 0;text-align: center;">
暂无数据
</div>
</el-dialog>
</template>
<script>
export default {
props:["ChangeThePriceData"],
data() {
return {
outerVisibleNot: true
}
},
watch: {
},
methods: {
closeChangeMachie(done) {
this.$emit('ChangeThePriceVisible')
},
}
}
</script>
src/components/index.vue
View file @ 06fc5ad4
......@@ -222,6 +222,11 @@
机票未绑团查看
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
订单改价详情
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()">
<i class="iconfont icon-menu-shezhi1" style="color:#2c3e50"></i>
设置
......@@ -1198,6 +1203,10 @@
<!-- 机票未绑团提示 -->
<unbundlingMessage v-if="unbundlingVisible"
:UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"></unbundlingMessage>
<!-- 改价提醒 -->
<ChangeThePriceMessage v-if="ChangeThePriceVisible" :ChangeThePriceData="ChangeThePriceData"
@ChangeThePriceVisible="ChangeThePriceVisible=false"></ChangeThePriceMessage>
</div>
</template>
......@@ -1221,6 +1230,8 @@
import commissionDetail from "./commonPage/commissionDetail.vue";
import Voting from "../components/administrative/model/Voting";
import unbundlingMessage from "../components/administrative/model/unbundlingMessage";
import ChangeThePriceMessage from "../components/administrative/model/ChangeThePriceMessage";
export default {
components: {
ChatList,
......@@ -1231,10 +1242,13 @@
commissonBill,
commissionDetail,
Voting,
unbundlingMessage
unbundlingMessage,
ChangeThePriceMessage
},
data() {
return {
ChangeThePriceData:[],
ChangeThePriceVisible: false,//改价提醒
UnboundDate: {},
unbundlingVisible: false,//未绑团提醒
b2bDomain: "",
......@@ -1855,10 +1869,28 @@
localStorage.removeItem("UnboundDate");
localStorage.removeItem("UnboundDateTime");
}
}
}
// 获取改价提醒
if(!localStorage.getItem("ChangeThePriceDataTime")||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
this.GetChangeThePrice()
}else{
// if(localStorage.getItem("ChangeThePriceData")){
// this.ChangeThePriceData = JSON.parse(localStorage.getItem("ChangeThePriceData"))
// }
}
// 两小时请求一次改价提醒
setInterval(()=>{
if(!this.ChangeThePriceVisible){
this.GetChangeThePrice()
}else{
clearInterval()
}
},7200000)
},
created() {
if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
......@@ -1893,6 +1925,51 @@
}
},
methods: {
// 获取改价提醒的数据
GetChangeThePrice(){
let msg = {
"pageIndex":1,
"pageSize":1,
"OrderId":"",
"GuestId":0,
"EnterId":0,
"OrderState":"1",
"Q_IsCollect":"2",
"StartTime":"",
"EndTime":"",
"FinishSTime":"",
"FinishETime":"",
"DepartSTime":"",
"DepartETime": this.getBeforeDate(0, new Date()),
"TCNUM":"",
"ProductName":"",
"CustomerName":"",
"LureEmpId":0,
"LineId":0,
"TravelType":0,
"OrderType":"0",
"IsSelectCRM":0,
"IsMyOrder":1,
"CommissionType":"-1"
}
this.ChangeThePriceData = []
this.apipost(
"CarSingle_post_GetChangePriceOrderPageList", msg,
res => {
if(res.data.resultCode==1){
if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){
localStorage.setItem("ChangeThePriceData", JSON.stringify(res.data.data.pageData));
localStorage.setItem("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
this.ChangeThePriceData = res.data.data.pageData
this.ChangeThePriceVisible = true
}else{
localStorage.removeItem("ChangeThePriceData");
localStorage.removeItem("ChangeThePriceDataTime");
}
}
}
);
},
// 获取未绑定团的数据
GetTravelAirNotBind(){
this.UnboundDate = {}
......
src/components/myOrdersAllType/components/OrderListExaminePrice.vue
View file @ 06fc5ad4
......@@ -275,7 +275,7 @@
</el-form-item></el-col
>
<el-col :span="8">
<el-form-item label="审核理由" prop="RefuseReason">
<el-form-item label="审核理由" prop="">
<el-input
:readonly="changePriceMsg.DialogType == 1 ? true : false"
type="textarea"
......
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