Skip to content

S
SuperMan
Commit 3a61981a authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents a89d922f 2ada4d98
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1202 additions and 702 deletions
src/components/index.vue
View file @ 3a61981a
...@@ -222,9 +222,9 @@ ...@@ -222,9 +222,9 @@
机票未绑团查看 机票未绑团查看
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true"> <el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i> <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
订单改价详情 订单改价查看
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()"> <el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()">
...@@ -1247,6 +1247,7 @@ ...@@ -1247,6 +1247,7 @@
}, },
data() { data() {
return { return {
ChangeThePriceList: [],
ChangeThePriceData:[], ChangeThePriceData:[],
ChangeThePriceVisible: false,//改价提醒 ChangeThePriceVisible: false,//改价提醒
UnboundDate: {}, UnboundDate: {},
...@@ -1873,24 +1874,33 @@ ...@@ -1873,24 +1874,33 @@
} }
// 获取改价提醒 // 获取改价提醒 每月1到10号提示
if(!localStorage.getItem("ChangeThePriceDataTime")|| let DateTime = new Date();
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){ let Year = DateTime.getFullYear()
this.GetChangeThePrice() let Month = DateTime.getMonth()+1
}else{ let Months = Month>9?Month:'0'+Month
// if(localStorage.getItem("ChangeThePriceData")){ let StartDate = Year+'-'+Months+'-01'
// this.ChangeThePriceData = JSON.parse(localStorage.getItem("ChangeThePriceData")) let DateList = []
// } for(let i=0;i<10;i++){
DateList.push(this.getBeforeDate(-i, new Date(StartDate).Format("yyyy-MM-dd")))
} }
// 两小时请求一次改价提醒 this.ChangeThePriceList = DateList.filter(x=>{
setInterval(()=>{ return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
if(!this.ChangeThePriceVisible){ })
if(this.ChangeThePriceList.length>0){
if(!localStorage.getItem("ChangeThePriceDataTime")||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
this.GetChangeThePrice() this.GetChangeThePrice()
}else{
clearInterval()
} }
},7200000) // 两小时请求一次改价提醒
setInterval(()=>{
if(!this.ChangeThePriceVisible){
this.GetChangeThePrice()
}else{
clearInterval()
}
},7200000)
}
}, },
created() { created() {
if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) { if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
......
src/components/myOrdersAllType/components/OrderListChangePrice.vue
View file @ 3a61981a
...@@ -76,31 +76,29 @@ ...@@ -76,31 +76,29 @@
</el-table-column> </el-table-column>
<el-table-column prop="StateName" label="状态" show-overflow-tooltip> <el-table-column prop="StateName" label="状态" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.StateName}} {{scope.row.OrderChangePriceId}}</span> <span>{{scope.row.StateName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope" > <template slot-scope="scope">
<el-button v-if="scope.row.OrderChangePriceId==0" size="mini" type="primary" @click="ckChangePrice(scope.row)">申请改价</el-button> <el-button v-if="scope.row.OrderChangePriceId==0" size="mini" type="primary" @click="ckChangePrice(scope.row)">申请改价</el-button>
<p v-else class="cursor-pointer c059FF6 fz18 row-c" @click="goDetails(scope.row)"> <el-button v-else size="mini" type="primary" @click="ckChangePrice(scope.row,1)">修改改价</el-button>
<span >{{scope.row.OrderChangePriceId}}</span>
</p>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="combottomDiv OPremarkDiv" v-if="changePriceMsg.outerVisible"> <div class="combottomDiv OPremarkDiv" v-if="changePriceMsg.outerVisible">
<div class="combottomTitle">{{$t('Operation.Op_remark')}}</div> <div class="combottomTitle">{{titlePrice}}</div>
<el-form label-width="100px"> <el-form label-width="100px">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="应收总金额" prop="Remark"> <el-form-item label="应收总金额" prop="">
<el-input type="textarea" v-model="changePriceMsg.Money" rows="6"></el-input> <el-input type="textarea" v-model="changePriceMsg.Money" rows="6"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="改价原因" prop="Remark"> <el-form-item label="改价原因" prop="">
<el-input type="textarea" v-model="changePriceMsg.ApplyForReason" rows="6"></el-input> <el-input type="textarea" v-model="changePriceMsg.ApplyForReason" rows="6"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -123,6 +121,7 @@ ...@@ -123,6 +121,7 @@
props: ["OrderList", "pagesTitle"], props: ["OrderList", "pagesTitle"],
data() { data() {
return { return {
titlePrice:'',
S_CheckBranchOrder: false, S_CheckBranchOrder: false,
S_CheckAllOrder: false, S_CheckAllOrder: false,
queryObj: null, queryObj: null,
...@@ -271,13 +270,31 @@ ...@@ -271,13 +270,31 @@
}) })
}, },
//点击修改订单总价 //点击修改订单总价
ckChangePrice(item) { ckChangePrice(item,type) {
this.titlePrice = type?'修改改价':'申请改价'
this.changePriceMsg.ID = type?item.OrderChangePriceId:0
this.changePriceMsg.OrderId = item.OrderId; this.changePriceMsg.OrderId = item.OrderId;
this.changePriceMsg.OrderType = item.OrderType; this.changePriceMsg.OrderType = item.OrderType;
this.changePriceMsg.PreferPrice = item.PreferPrice; // this.changePriceMsg.PreferPrice = item.PreferPrice;
this.changePriceMsg.Money = item.Money; // this.changePriceMsg.Money = item.Money;
this.changePriceMsg.setPlatDialog = false; this.changePriceMsg.setPlatDialog = false;
this.changePriceMsg.outerVisible = true; this.changePriceMsg.outerVisible = true;
this.getGetOrderChangePriceDetai(item)
},
getGetOrderChangePriceDetai(item){
this.apipost('CarSingle_post_GetOrderChangePriceDetail', {
ID:item.OrderChangePriceId
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
this.changePriceMsg.Money = data.Money;
this.changePriceMsg.ApplyForState = data.ApplyForState;
this.changePriceMsg.ApplyForReason = data.ApplyForReason;
this.changePriceMsg.PreferPrice = data.ApplyForMoney;
this.changePriceMsg.RefuseReason = data.RefuseReason;
}
})
}, },
GetAdminCarOrderPageList(row, url, href, data) { GetAdminCarOrderPageList(row, url, href, data) {
let msg = { let msg = {
......
src/components/myOrdersAllType/components/OrderListExaminePrice.vue
View file @ 3a61981a
...@@ -35,6 +35,14 @@ ...@@ -35,6 +35,14 @@
<span>{{ scope.row.OrderId }}</span> <span>{{ scope.row.OrderId }}</span>
</p> </p>
<p>{{ scope.row.CreateTimeStr }}</p> <p>{{ scope.row.CreateTimeStr }}</p>
<p style="font-size: 13px;" v-if="scope.row.SaleRemarks">
<span>销售备注：</span>
<span style="color: red;">{{ scope.row.SaleRemarks? scope.row.SaleRemarks:'无' }}</span>
</p>
<p style="font-size: 13px;" v-if="scope.row.OP_Remarks">
<span>OP备注：</span>
<span style="color: red;">{{ scope.row.OP_Remarks? scope.row.OP_Remarks:'无' }}</span>
</p>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -98,6 +106,11 @@ ...@@ -98,6 +106,11 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="在途金额" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.PlatformMoney }}
</template>
</el-table-column>
<el-table-column <el-table-column
sortable sortable
prop="Money" prop="Money"
...@@ -240,13 +253,16 @@ ...@@ -240,13 +253,16 @@
type="primary" @click="setChangePrice">保存</button> --> type="primary" @click="setChangePrice">保存</button> -->
</div> </div>
<el-form label-width="100px"> <el-form label-width="120px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="申请总金额"> <el-form-item label="订单应收总金额">
<span rows="6">{{ changePriceMsg.PreferPrice }}</span> <span rows="6">
{{changePriceMsg.Money2}}
</span>
</el-form-item></el-col </el-form-item></el-col
> >
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申请理由"> <el-form-item label="申请理由">
<span rows="6">{{ changePriceMsg.ApplyForReason }} </span> <span rows="6">{{ changePriceMsg.ApplyForReason }} </span>
...@@ -254,6 +270,11 @@ ...@@ -254,6 +270,11 @@
> >
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4">
<el-form-item label="申请总金额">
<span rows="6">{{ changePriceMsg.PreferPrice }}</span>
</el-form-item></el-col
>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="应收总金额" prop="Money"> <el-form-item label="应收总金额" prop="Money">
<el-input <el-input
...@@ -368,6 +389,7 @@ export default { ...@@ -368,6 +389,7 @@ export default {
this.changePriceMsg.setPlatDialog = true; this.changePriceMsg.setPlatDialog = true;
this.changePriceMsg.outerVisible = false; this.changePriceMsg.outerVisible = false;
this.$message.info(res.data.message); this.$message.info(res.data.message);
this.$emit('success')
} else { } else {
this.$message.info(res.data.message); this.$message.info(res.data.message);
} }
...@@ -404,9 +426,11 @@ export default { ...@@ -404,9 +426,11 @@ export default {
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
this.changePriceMsg.Money2 = data.Money;
this.changePriceMsg.Money = data.Money; this.changePriceMsg.Money = data.Money;
this.changePriceMsg.ApplyForState = data.ApplyForState; this.changePriceMsg.ApplyForState = data.ApplyForState;
this.changePriceMsg.ApplyForReason = data.ApplyForReason; this.changePriceMsg.ApplyForReason = data.ApplyForReason;
this.changePriceMsg.PreferPrice = item.ApplyForMoney;
if (type == 0) { if (type == 0) {
this.changePriceMsg.PreferPrice = item.ApplyForMoney; this.changePriceMsg.PreferPrice = item.ApplyForMoney;
} else { } else {
......
src/components/myOrdersAllType/components/allList.vue
View file @ 3a61981a
...@@ -87,32 +87,35 @@ ...@@ -87,32 +87,35 @@
<div class="HotelWorkList"> <div class="HotelWorkList">
<div class="query-box HotelWorkInput" style="border-bottom: none;"> <div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul> <ul>
<!-- <li> <li v-if="Title=='审核'">
<span><em>客人姓名</em> <span>
<el-input clearable v-model="msg.CustomerName" placeholder="客人姓名" class="w200"/> <em>审核状态</em>
</span> <el-select v-model='msg.OrderState' class="w200">
</li> --> <!-- <el-option :value="0" label="不限"></el-option> -->
<li> <el-option v-for='item in OrderStatusList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li v-if="Title!='申请'&&Title!='审核'">
<span><em>商品名称</em> <span><em>商品名称</em>
<el-input clearable type="" v-model="msg.ProductName" placeholder="请输入商品名称" class="w200"/> <el-input clearable type="" v-model="msg.ProductName" placeholder="请输入商品名称" class="w200"/>
</span> </span>
</li> </li>
<li> <li v-if="Title!='申请'&&Title!='审核'">
<span><em>订单Id</em> <span><em>订单Id</em>
<el-input clearable type="Number" v-model="msg.OrderId" placeholder="请输入订单Id" class="w200"/> <el-input clearable type="Number" v-model="msg.OrderId" placeholder="请输入订单Id" class="w200"/>
</span> </span>
</li> </li>
<li> <li v-if="Title!='申请'&&Title!='审核'">
<span><em>团号</em> <span><em>团号</em>
<el-input clearable type="" v-model="msg.TCNUM" placeholder="请输入团号" class="w200"/> <el-input clearable type="" v-model="msg.TCNUM" placeholder="请输入团号" class="w200"/>
</span> </span>
</li> </li>
<!-- <li> <li v-if="Title!='销售'&&Title!='申请'&&Title!='审核'">
<span><em>电话</em>
<el-input clearable v-model="msg.Mobile" placeholder="电话" class="w200"/>
</span>
</li> -->
<li v-if="Title!='销售'">
<span> <span>
<em>业务员</em> <em>业务员</em>
<el-select filterable v-model='msg.EnterId' class="w200" clearable> <el-select filterable v-model='msg.EnterId' class="w200" clearable>
...@@ -125,7 +128,7 @@ ...@@ -125,7 +128,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li v-if="Title!='销售'"> <li v-if="Title!='销售'&&Title!='申请'&&Title!='审核'">
<span> <span>
<em>引流人</em> <em>引流人</em>
<el-select filterable v-model='msg.LureEmpId' class="w200" clearable> <el-select filterable v-model='msg.LureEmpId' class="w200" clearable>
...@@ -138,7 +141,7 @@ ...@@ -138,7 +141,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li v-if="Title!='审核'">
<span> <span>
<em>订单类型</em> <em>订单类型</em>
<el-select v-model="msg.OrderType" class="w200 HworkInput"> <el-select v-model="msg.OrderType" class="w200 HworkInput">
...@@ -148,7 +151,7 @@ ...@@ -148,7 +151,7 @@
</li> </li>
<li> <li v-if="Title!='申请'&&Title!='审核'">
<span> <span>
<em>订单状态</em> <em>订单状态</em>
<el-select v-model='msg.OrderState' class="w200"> <el-select v-model='msg.OrderState' class="w200">
...@@ -161,7 +164,7 @@ ...@@ -161,7 +164,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li v-if="Title!='申请'&&Title!='审核'">
<span> <span>
<em>收款状态</em> <em>收款状态</em>
<el-select v-model='msg.Q_IsCollect' class="w200"> <el-select v-model='msg.Q_IsCollect' class="w200">
...@@ -175,7 +178,7 @@ ...@@ -175,7 +178,7 @@
</li> </li>
<li> <li v-if="Title!='审核'">
<span> <span>
<em>报名时间</em> <em>报名时间</em>
<el-date-picker <el-date-picker
...@@ -189,7 +192,7 @@ ...@@ -189,7 +192,7 @@
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<li style="line-height: 30px; padding-left: 30px;"> <li style="line-height: 30px; padding-left: 30px;" v-if="Title!='申请'&&Title!='审核'">
<el-popover width="350" trigger="click"> <el-popover width="350" trigger="click">
<div class="groupSuperSearchLayer"> <div class="groupSuperSearchLayer">
<p style="padding-bottom: 10px;">订单高级查询</p> <p style="padding-bottom: 10px;">订单高级查询</p>
...@@ -268,7 +271,7 @@ ...@@ -268,7 +271,7 @@
</ul> </ul>
</div> </div>
<!-- 统计版块 --> <!-- 统计版块 -->
<div class="groupTourOrder_count"> <div class="groupTourOrder_count" v-if="pagesTitle=='销售'||pagesTitle=='OP'">
<!-- <el-row :gutter="20"> <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8"></el-col></el-row> --> <!-- <el-row :gutter="20"> <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8"></el-col></el-row> -->
<div class="groupTourOrder_count_item HT_total" v-for="(item,index) in SummaryList"> <div class="groupTourOrder_count_item HT_total" v-for="(item,index) in SummaryList">
<div> <div>
...@@ -365,7 +368,7 @@ ...@@ -365,7 +368,7 @@
OrderList: [], OrderList: [],
//默认高度 //默认高度
tableHeight: 0, tableHeight: 0,
msg:{ msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
OrderId: "", //订单id OrderId: "", //订单id
...@@ -432,6 +435,12 @@ ...@@ -432,6 +435,12 @@
], ],
LineList: [], LineList: [],
SummaryList: [], SummaryList: [],
OrderStatusList: [
{ Name: "不限", Id: "0" },
{ Name: "待审核", Id: "1" },
{ Name: "已通过", Id: "2" },
{ Name: "已取消", Id: "3" },
]
}; };
}, },
watch: { watch: {
...@@ -575,14 +584,28 @@ ...@@ -575,14 +584,28 @@
//获取酒店订单列表 //获取酒店订单列表
GetList() { GetList() {
this.loading = true this.loading = true
let msgObj
let msg = {
OrderId: '',
OrderState: '0',
OrderType: '0',
papageIndex: 1,
pagesize: 15
}
let url = "CarSingle_post_GetGuestOrderStatisticsPageList" let url = "CarSingle_post_GetGuestOrderStatisticsPageList"
// 销售 OP // 销售 OP
if(this.pagesTitle=='销售'){ if(this.pagesTitle=='销售'){
this.msg.IsMyOrder = '1' this.msg.IsMyOrder = '1'
}else{ }else if(this.pagesTitle=='申请'){
url = "CarSingle_post_GetChangePriceOrderPageList"
this.msg.IsMyOrder = '1'
}else if(this.pagesTitle=='审核'){
url = "CarSingle_post_GetExaminePriceOrderPageList"
} else{
this.msg.IsMyOrder = '0' this.msg.IsMyOrder = '0'
} }
this.apipost(url, this.msg, msgObj = this.pagesTitle=='审核'?msg:this.msg
this.apipost(url, msgObj,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getSummaryData() this.getSummaryData()
...@@ -633,9 +656,17 @@ ...@@ -633,9 +656,17 @@
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
this.msg.EnterId = this.$route.query.EnterId?Number(this.$route.query.EnterId):0//userInfo.EmployeeId; this.msg.EnterId = this.$route.query.EnterId?Number(this.$route.query.EnterId):0//userInfo.EmployeeId;
this.msg.LureEmpId = this.$route.query.LureEmpId?Number(this.$route.query.LureEmpId):0 this.msg.LureEmpId = this.$route.query.LureEmpId?Number(this.$route.query.LureEmpId):0
this.msg.StartTime = this.getBeforeDate(0, new Date()) if(this.pagesTitle=='销售'||this.pagesTitle=='OP'){
this.msg.EndTime = this.getBeforeDate(0, new Date()) this.msg.StartTime = this.getBeforeDate(0, new Date())
this.DatelistBM = [new Date(this.msg.StartTime),new Date()] this.msg.EndTime = this.getBeforeDate(0, new Date())
this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
}else{
this.msg.DepartSTime = this.getBeforeDate(200, new Date())
this.msg.DepartETime = this.getBeforeDate(0, new Date())
this.DatelistBM = [this.msg.DepartSTime,this.msg.DepartETime]
this.msg.Q_IsCollect = '2'
}
if(this.$route.query.OrderId){ if(this.$route.query.OrderId){
this.msg.OrderId=this.$route.query.OrderId this.msg.OrderId=this.$route.query.OrderId
this.msg.StartTime = '' this.msg.StartTime = ''
......
src/components/myOrdersAllType/components/allListChangePrice.vue
View file @ 3a61981a
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
</li> </li>
<li> <li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click="msg.pageIndex=1,currentPage=1,GetList();showWarningSearch=false" /> @click="msg.pageIndex=1,currentPage=1,GetList(),showWarningSearch=false" />
</li> </li>
<li style="line-height: 30px; padding-left: 30px;"> <li style="line-height: 30px; padding-left: 30px;">
......
src/components/myOrdersAllType/erpChangePricehOrder.vue
View file @ 3a61981a
...@@ -7,12 +7,13 @@ ...@@ -7,12 +7,13 @@
</div> </div>
</template> </template>
<script> <script>
import allList from './components/allListChangePrice.vue'; // import allList from './components/allListChangePrice.vue';
import allList from './components/allList.vue';
export default { export default {
components: { allList }, components: { allList },
data() { data() {
return { return {
pagesTitle: '销售', pagesTitle: '申请',
dataObj:{ dataObj:{
OrderId: '', OrderId: '',
} }
...@@ -20,14 +21,14 @@ ...@@ -20,14 +21,14 @@
}, },
watch: { watch: {
pagesTitle(val,oldval){ pagesTitle(val,oldval){
}, },
}, },
methods: { methods: {
}, },
created() { created() {
}, },
mounted() { mounted() {
if(this.$route.query.OrderId){ if(this.$route.query.OrderId){
......
src/components/myOrdersAllType/erpExaminePricehOrder.vue
View file @ 3a61981a
...@@ -7,12 +7,13 @@ ...@@ -7,12 +7,13 @@
</div> </div>
</template> </template>
<script> <script>
import allList from './components/allListExaminePrice.vue'; // import allList from './components/allListExaminePrice.vue';
import allList from './components/allList.vue';
export default { export default {
components: { allList }, components: { allList },
data() { data() {
return { return {
pagesTitle: '销售', pagesTitle: '审核',
dataObj:{ dataObj:{
OrderId: '', OrderId: '',
} }
...@@ -20,14 +21,14 @@ ...@@ -20,14 +21,14 @@
}, },
watch: { watch: {
pagesTitle(val,oldval){ pagesTitle(val,oldval){
}, },
}, },
methods: { methods: {
}, },
created() { created() {
}, },
mounted() { mounted() {
if(this.$route.query.OrderId){ if(this.$route.query.OrderId){
......
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