Skip to content

S
SuperMan
Commit dc791bef authored by youjie's avatar youjie
Browse files
Options

审核改价提醒

parent 70e1da66
Hide whitespace changes
Inline Side-by-side
Showing with 334 additions and 40 deletions
src/components/administrative/model/ChangeThePriceMessage.vue
View file @ dc791bef
......@@ -2,17 +2,18 @@
<el-dialog custom-class='PingFangSC' title="订单改价提醒"
:visible.sync="outerVisibleNot" center
:before-close="closeChangeMachie" width="1100px">
<div>
<div v-if="ChangeThePriceObj.ChangeThePriceData.length>0"
style="margin-bottom: 25px;">
<p style="color: red;font-size: 16px;">
提示：
改价提示：
<span>一共有 <span class="c059FF6 fz16"
style="padding: 0 10px;cursor: pointer;font-weight: bold;display: inline-block;"
@click="ckChangePrice">
{{ChangeThePriceData.length}}
{{msg.total2}}
</span>
条账未平数据，快去
<span class="c059FF6 fz16"
style="margin-left: 10px;margin-right: 10px;cursor: pointer;font-weight: bold;" @click="ckChangePrice">申请改价</span>
style="margin-left: 10px;margin-right: 10px;cursor: pointer;font-weight: bold;" @click="ckChangePrice(1)">申请改价</span>
吧
</span>
</p>
......@@ -22,7 +23,7 @@
<el-table
border
ref="multipleTable"
:data="ChangeThePriceData"
:data="ChangeThePriceObj.ChangeThePriceData"
style="width: 100%"
:default-sort="{ prop: 'null', order: 'null' }"
:sort-by="[
......@@ -41,6 +42,7 @@
prop="CreateTimeStr"
label="订单Id"
show-overflow-tooltip
fixed="left"
>
<template slot-scope="scope">
<div>
......@@ -62,6 +64,7 @@
prop="CreateTimeStr"
label="团号"
show-overflow-tooltip
fixed="left"
>
<template slot-scope="scope">
<div>
......@@ -182,18 +185,26 @@
prop="ApplyForState"
label="改价状态"
show-overflow-tooltip
min-width="110"
>
<template slot-scope="scope">
<span
>{{
scope.row.ApplyForState == 1
? "待审核"
: scope.row.ApplyForState == 2
? "已通过"
: scope.row.ApplyForState == 3
? "已拒绝"
: ""
}}
>
<template v-if="scope.row.OrderChangePriceId==0">
待申请
</template>
<template v-if="scope.row.ApplyForState==1">
待主管审核
</template>
<template v-else-if="scope.row.ApplyForState==2">
主管审核通过
</template>
<template v-else-if="scope.row.ApplyForState==3">
审核通过
</template>
<template v-else-if="scope.row.ApplyForState==4">
拒绝
</template>
</span>
</template>
</el-table-column>
......@@ -204,7 +215,7 @@
<p
class="c059FF6 fz14"
style="cursor: pointer;font-weight: bold;"
@click="ckChangePrice(scope.row)"
@click="ckChangePrice(scope.row,1)"
>
申请改价
</p>
......@@ -212,6 +223,228 @@
</el-table-column>
</el-table>
</div>
<div v-if="ChangeThePriceObj.ExamineThePriceData.length>0">
<p style="color: red;font-size: 16px;">
审核提示：
<span>一共有 <span class="c059FF6 fz16"
style="padding: 0 10px;cursor: pointer;font-weight: bold;display: inline-block;"
@click="ckChangePrice">
{{msg.total}}
</span>
条改价申请待审核，快去
<span class="c059FF6 fz16"
style="margin-left: 10px;margin-right: 10px;cursor: pointer;font-weight: bold;" @click="ckChangePrice(2)">审核</span>
吧
</span>
</p>
<p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;margin-top: 5px;">审核改价列表
</p>
<el-table
border
ref="multipleTable"
:data="ChangeThePriceObj.ExamineThePriceData"
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
fixed="left"
>
<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
fixed="left"
>
<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
min-width="110"
>
<template slot-scope="scope">
<span
><template v-if="scope.row.ApplyForState==1">
待主管审核
</template>
<template v-else-if="scope.row.ApplyForState==2">
主管审核通过
</template>
<template v-else-if="scope.row.ApplyForState==3">
审核通过
</template>
<template v-else-if="scope.row.ApplyForState==4">
拒绝
</template>
</span>
</template>
</el-table-column>
<el-table-column label="操作"
show-overflow-tooltip
fixed="right">
<template slot-scope="scope">
<p
class="c059FF6 fz14"
style="cursor: pointer;font-weight: bold;"
@click="ckChangePrice(scope.row,2)"
>
审核
</p>
</template>
</el-table-column>
</el-table>
</div>
<!--
<el-pagination background
v-if="ChangeThePriceObj.ExamineThePriceData.length>0"
@current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total">
</el-pagination> -->
<!-- <div v-if="ChangeThePriceData.length==0" style="padding: 40px 0;text-align: center;">
暂无数据
</div> -->
......@@ -220,7 +453,7 @@
<script>
export default {
props:["ChangeThePriceData"],
props:["ChangeThePriceObj","msg"],
data() {
return {
outerVisibleNot: true
......@@ -233,7 +466,7 @@
goDetails(row){
},
ckChangePrice(row){
ckChangePrice(row,type){
this.closeChangeMachie()
let obj
if(row.OrderId){
......@@ -250,13 +483,16 @@
}
}
this.$router.push({
name: 'erpChangePricehOrder',
name: type==1?'erpChangePricehOrder':'erpExaminePricehOrder',
query: obj
});
},
closeChangeMachie(done) {
this.$emit('ChangeThePriceVisible')
},
handleCurrentChange(val) {
this.$emit('GetList',val)
},
}
}
</script>
src/components/index.vue
View file @ dc791bef
......@@ -222,7 +222,8 @@
机票未绑团查看
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="GetChangeThePrice(1)">
<el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other"
@click.native="GetChangeThePrice(1),GetExaminePriceOrderPageList(1)">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
订单改价查看
<i class="iconfont icon-right1"></i>
......@@ -1204,9 +1205,12 @@
<unbundlingMessage v-if="unbundlingVisible"
:UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"></unbundlingMessage>
<!-- 改价提醒 -->
<ChangeThePriceMessage v-if="ChangeThePriceVisible" :ChangeThePriceData="ChangeThePriceData"
@ChangeThePriceVisible="ChangeThePriceVisible=false"></ChangeThePriceMessage>
<!-- 改价提醒/审核改价提醒 -->
<ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible"
:type="1"
:msg="ExamineThePriceMsg"
:ChangeThePriceObj="ChangeThePriceObj"
@ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
</div>
</template>
......@@ -1243,13 +1247,26 @@
commissionDetail,
Voting,
unbundlingMessage,
ChangeThePriceMessage
ChangeThePriceMessage,
},
data() {
return {
ExamineThePriceMsg:{
OrderId:"",
OrderState:"1",
OrderType:"0",
pageIndex:1,
pageSize:5,
total: 0,
total2: 0,
},
ExamineThePriceVisible: false,//审核改价提醒
ChangeThePriceList: [],
ChangeThePriceData:[],
ChangeThePriceVisible: false,//改价提醒
ChangeThePriceObj:{
ExamineThePriceData:[],
ChangeThePriceData:[],
},
UnboundDate: {},
unbundlingVisible: false,//未绑团提醒
b2bDomain: "",
......@@ -1874,7 +1891,7 @@
}
// 获取改价提醒 每月1到10号提示
// 获取改价及审核提醒 每月1到10号提示
let DateTime = new Date();
let Year = DateTime.getFullYear()
let Month = DateTime.getMonth()+1
......@@ -1888,14 +1905,18 @@
return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
})
if(this.ChangeThePriceList.length>0){
if(!localStorage.getItem("ChangeThePriceDataTime")||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
if((!localStorage.getItem("ChangeThePriceDataTime")||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))))
||(!localStorage.getItem("ExamineThePriceDataTime")||
(localStorage.getItem("ExamineThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))))){
this.GetChangeThePrice()
this.GetExaminePriceOrderPageList()
}
// 两小时请求一次改价提醒
// 两小时请求一次改价、审核改价提醒
setInterval(()=>{
if(!this.ChangeThePriceVisible){
this.GetChangeThePrice()
this.GetExaminePriceOrderPageList()
}else{
clearInterval()
}
......@@ -1935,6 +1956,33 @@
}
},
methods: {
//获取改价需审核提醒的数据
GetList(val){
this.ExamineThePriceMsg.pageIndex = val
this.GetExaminePriceOrderPageList()
},
GetExaminePriceOrderPageList(type){
this.apipost(
"CarSingle_post_GetExaminePriceOrderPageList",this.ExamineThePriceMsg,
res => {
if(res.data.resultCode==1){
if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){
if(!this.ExamineThePriceMsg.total) this.ExamineThePriceMsg.total = res.data.data.count
// localStorage.setItem("ExamineThePriceData", JSON.stringify(res.data.data.pageData));
localStorage.setItem("ExamineThePriceDataTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
this.ChangeThePriceObj.ExamineThePriceData = res.data.data.pageData
this.ExamineThePriceVisible = true
}else{
if(type==1){
// this.$message.info('暂无订单审核数据')
}
// localStorage.removeItem("ExamineThePriceData");
localStorage.removeItem("ExamineThePriceDataTime");
}
}
}
);
},
// 获取改价提醒的数据
GetChangeThePrice(type){
let DateTime = new Date();
......@@ -1945,7 +1993,7 @@
let DepartETime = Year+'-'+Months+'-'+day
let msg = {
pageIndex:1,
pagesize:15,
pagesize:5,
OrderId:0,
GuestId:0,
EnterId:0,
......@@ -1974,15 +2022,16 @@
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));
if(!this.ExamineThePriceMsg.total2) this.ExamineThePriceMsg.total2 = res.data.data.count
// 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.ChangeThePriceObj.ChangeThePriceData = res.data.data.pageData
this.ChangeThePriceVisible = true
}else{
if(type==1){
this.$message.info('暂无订单改价数据')
// this.$message.info('暂无订单改价数据')
}
localStorage.removeItem("ChangeThePriceData");
// localStorage.removeItem("ChangeThePriceData");
localStorage.removeItem("ChangeThePriceDataTime");
}
}
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ dc791bef
......@@ -949,14 +949,20 @@ export default {
},
OrderList: {
handler(val, oldVal) {
if(this.pagesTitle=='申请'&&this.msgObj.OrderId!=0&&this.$route.query.OrderId
if((this.pagesTitle=='申请'||this.pagesTitle=='审核')&&this.msgObj.OrderId!=0&&this.$route.query.OrderId
&&this.$route.query.OrderType
&&this.$route.query.DepartSTime
&&this.$route.query.DepartSTime
&&val&&val.length==1){
this.ckChangePrice(val[0])
if(this.pagesTitle=='审核'){
this.ckChangePrice(val[0],2)
}else{
this.ckChangePrice(val[0])
}
}
}
},
deep: true,
immediate: true
}
},
methods: {
......@@ -1026,7 +1032,6 @@ export default {
if (type == 2) this.titlePrice = "应收总金额改价审核";
if (type == 3) this.titlePrice = "改价详情";
this.changePriceObj = item
console.log(this.changePriceObj.ApplyForState,'======')
this.changePriceMsg.ID = type ? item.OrderChangePriceId : 0;
this.changePriceMsg.OrderId = item.OrderId;
this.changePriceMsg.OrderType = item.OrderType;
......
src/components/myOrdersAllType/components/allList.vue
View file @ dc791bef
......@@ -371,8 +371,8 @@
OrderId: '',
OrderState: '1',
OrderType: '0',
papageIndex: 1,
pagesize: 15
pageIndex: 1,
pageSize: 15
},
CommissionTypeList:[
{Name: '不限',Id:'-1'},
......@@ -498,6 +498,8 @@
handler(val, oldVal) {
this.msg.OrderType = val.tab
this.msg.OrderId = val.OrderId
this.msg2.OrderType = val.tab
this.msg2.OrderId = val.OrderId
if(val.DepartSTime&&val.DepartSTime){
this.msg.DepartSTime = val.DepartSTime;
this.msg.DepartETime = val.DepartSTime;
......@@ -512,7 +514,9 @@
search(){
this.changePriceOuterVisible = false
if(this.dataObj&&this.dataObj.OrderId){
this.msg.OrderId=0
this.msg.OrderId = 0
this.msg2.OrderId = 0
this.msg2.OrderType = '0'
}
this.msg.pageIndex=1,
this.currentPage=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