Skip to content

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

1

parent 349ad91a
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 262 deletions
src/components/TravelManager/customizedcar/travelOrders.vue
View file @ cfe99384
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" <el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期"> range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
<span style="margin-left:15px">所属平台：</span> <span style="margin-left:15px">订单来源：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderSource" size="small" <el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderSource" size="small"
placeholder="请选择"> placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option> <el-option label="不限" :value="0"></el-option>
<el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -27,13 +27,7 @@ ...@@ -27,13 +27,7 @@
<el-option v-for="item in orderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in orderTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
<span style="margin-left:15px">配送方式：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.DeliveryMethod" size="small"
placeholder="请选择">
<el-option label="全部订单" :value="0"></el-option>
<el-option v-for="item in deliveryList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable <el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
style="margin-left:15px;width:300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal" style="margin-left:15px;width:300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
size="small"> size="small">
...@@ -44,12 +38,7 @@ ...@@ -44,12 +38,7 @@
</el-input> </el-input>
</div> </div>
<div style="display: flex;flex-direction: row;align-items: center;justify-content: space-between"> <div style="display: flex;flex-direction: row;align-items: center;justify-content: space-between">
<div> <!-- <div>
<span>主播名称：</span>
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
style="margin-top:10px;width:200px" class="input-with-select" placeholder="请输入主播名称" v-model="msg.AnchorName"
size="small">
</el-input>
<el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px" <el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px"
@change="msg.pageIndex=1,getList()">只看已付款</el-checkbox> @change="msg.pageIndex=1,getList()">只看已付款</el-checkbox>
</div> </div>
...@@ -74,7 +63,7 @@ ...@@ -74,7 +63,7 @@
<div class="fkbox_item" style="background: #FFF100"></div> <div class="fkbox_item" style="background: #FFF100"></div>
<span>驳回</span> <span>驳回</span>
</div> </div>
</div> </div> -->
</div> </div>
<div> <div>
<el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick"> <el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick">
...@@ -89,24 +78,21 @@ ...@@ -89,24 +78,21 @@
<div style="width: 20%;">实付金额</div> <div style="width: 20%;">实付金额</div>
<div style="width: 20%;">操作</div> <div style="width: 20%;">操作</div>
</div> </div>
<div v-loading="loading" class="app-order-list"> <div class="app-order-list">
<el-card v-for="(item,index) in tableData" :key="index" class="app-order-item" shadow="never"> <el-card v-for="(item,index) in tableData" :key="index" class="app-order-item" shadow="never">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<div flex="cross:center" class="app-order-head"> <div flex="cross:center" class="app-order-head">
<div class="app-order-time">{{item.CreateDate}}</div> <div class="app-order-time">{{item.CreateDate}}</div>
<div class="app-order-user"> <div class="app-order-user">
<span class="app-order-time" style="margin-right: 5px">订单号：</span>{{item.OrderNo}}({{item.OrderId}}) <span class="app-order-time" style="margin-right: 5px">订单号：</span>{{item.OrderNo}}({{item.OrderId}})
<el-tag v-if="item.OrderSource==1" size="small">{{item.OrderSourceName}}</el-tag> <el-tag v-if="item.OrderSource==1" size="small">{{item.OrderTypeName}}</el-tag>
<el-tag v-if="item.OrderSource==2" size="small" type="success">{{item.OrderSourceName}}</el-tag> <el-tag v-if="item.OrderSource==2" size="small" type="success">{{item.OrderTypeName}}</el-tag>
<el-tag v-if="item.OrderSource==3" size="small" type="info">{{item.OrderSourceName}}</el-tag> <el-tag v-if="item.OrderSource==3" size="small" type="info">{{item.OrderTypeName}}</el-tag>
<el-tag v-if="item.OrderSource==4" size="small" type="warning">{{item.OrderSourceName}}</el-tag> <el-tag v-if="item.OrderSource==4" size="small" type="warning">{{item.OrderTypeName}}</el-tag>
<el-tag v-if="item.OrderSource==5" size="small" type="danger">{{item.OrderSourceName}}</el-tag> <el-tag v-if="item.OrderSource==5" size="small" type="danger">{{item.OrderTypeName}}</el-tag>
<el-tag v-if="item.OrderSource==6" size="small" type="danger">{{item.OrderSourceName}}</el-tag> <el-tag v-if="item.OrderSource==6" size="small" type="danger">{{item.OrderTypeName}}</el-tag>
</div>
<div class="app-order-user"
v-if="item.SmallShopsName!=''&& item.SmallShopsName!=null&& item.SmallShopsId!=0 ">
<span class="app-order-time">微店名称：</span>{{item.SmallShopsName}}
</div> </div>
<div flex="cross:center" class="app-order-user"> <div flex="cross:center" class="app-order-user">
<img v-if="item.OrderSource==1" src="../../../assets/img/userman/wx.png" alt=""> <img v-if="item.OrderSource==1" src="../../../assets/img/userman/wx.png" alt="">
<span>{{item.UserName}}({{item.UserId}})</span> <span>{{item.UserName}}({{item.UserId}})</span>
...@@ -119,111 +105,103 @@ ...@@ -119,111 +105,103 @@
</div> </div>
<div flex="dir:left wrap:wrap" class="app-order-offline"> <div flex="dir:left wrap:wrap" class="app-order-offline">
<el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag> <el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
<el-tag <el-tag v-if="item.OrderStatus== 2 " style="margin-left:5px" size="small" type="success">待确认</el-tag>
<!-- <el-tag
v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''" v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
style="margin-left:5px" size="small" type="warning">已付款</el-tag> style="margin-left:5px" size="small" type="warning">已付款</el-tag>
<el-tag v-if="item.DeliveryTime=='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
type="success">待确认</el-tag>
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small" <el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
type="success">待出行</el-tag> type="success">待出行</el-tag>
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small" <el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
type="success">出行中</el-tag> type="success">出行中</el-tag>
<el-tag v-if="item.ReceivingTime!='' && item.FinishTime==''" style="margin-left:5px" size="small" <el-tag v-if="item.ReceivingTime!='' && item.FinishTime==''" style="margin-left:5px" size="small"
type="success">出行完成</el-tag> type="success">出行完成</el-tag> -->
<el-tag v-if="item.FinishTime!=''" style="margin-left:5px" size="small" type="success">已完成</el-tag> <el-tag v-if="item.OrderStatus==3" style="margin-left:5px" size="small" type="success">已完成</el-tag>
<el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag> <el-tag v-if="item.OrderStatus==4" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
</div> </div>
<el-tooltip class="item" effect="dark" content="强制取消" placement="top-start"> <el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
<img v-if="item.OrderStatus==1 || item.OrderStatus==2" @click="OrderExit2(item)" style="right:60px" <img v-if="item.OrderStatus==1 || item.OrderStatus==2" @click="OrderExit2(item)" style="right:60px"
class="app-order-btnimg" src="../../../assets/img/userman/force.png" alt=""> class="app-order-btnimg" src="../../../assets/img/userman/force.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start"> <el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">
<img v-if="msg.Recycled!=1" @click="fRhsz(item,4)" class="app-order-btnimg" <img v-if="msg.Recycled!=1" @click="fRhsz(item,3)" class="app-order-btnimg"
src="../../../assets/img/userman/del1.png" alt=""> src="../../../assets/img/userman/del1.png" alt="">
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="app-order-body"> <div class="app-order-body">
<div class="goods-item" style="width: 65%;"> <div class="goods-item" style="width: 65%;">
<div v-for="(list,index2) in item.DetailList" :key="index2" class="goods"> <div v-for="(list,index2) in getshangplist(item)" :key="index2" class="goods">
<div> <div >
<el-image :src="list.CoverImagePath" class="goods-image" :preview-src-list="[list.CoverImagePath]"> <el-image :src="list.HotelImage" v-if='item.OrderType == 1' class="goods-image" :preview-src-list="[list.HotelImage]"></el-image>
</el-image> <el-image :src="list.DiningImg" v-if='item.OrderType == 2' class="goods-image" :preview-src-list="[list.DiningImg]"></el-image>
<div flex="dir:left"> <el-image :src="list.TicketImg" v-if='item.OrderType == 3' class="goods-image" :preview-src-list="[list.TicketImg]"></el-image>
<div flex="dir:left" style='display:flex'>
<div class="goods-info"> <div class="goods-info">
<div class="goods-name"> <div class="goods-name">
<div class="app-ellipsis"> <div class="app-ellipsis">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;"> <div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;">
<span class="el-tag el-tag--warning el-tag--mini el-tag--light is-hit" <span v-if='item.OrderType == 1'>{{list.HotelName}}</span>
style="margin-right: 5px;"> <span v-if='item.OrderType == 2'>{{list.MealName}}</span>
{{list.OrderTypeName}} <span v-if='item.OrderType == 3'>{{list.TicketName}}</span>
</span> <span v-if='item.OrderType == 4'>{{list.StartCityName}} - {{list.ArriveCityName}}</span>
{{list.GoodsName}}
</div> </div>
</div> </div>
</div> </div>
<div style="margin-bottom: 5px;"> <div style="margin-bottom: 5px;">
<span style="margin-right: 10px;"> <span style="margin-right: 10px;" v-if='item.OrderType == 1'>房间数：x{{list.RoomNumber}}</span>
车辆：{{list.CarName}}、{{list.CarColorName}}、{{list.CarNumber}} <span style="margin-right: 10px;" v-if='item.OrderType == 2 || item.OrderType == 3'>数量：x{{list.PeopleNumber}}</span>
</span>
</div>
<div style="margin-bottom: 5px;">
<span style="margin-right: 10px;">
导游：{{list.GuideName}}
</span>
<span style="margin-right: 10px;">
服务类型：{{list.CarTypeName}}、{{list.CarType==5? (list.IsSpell==1?'拼车':'不拼车'):''}}
</span>
</div> </div>
<div style="margin-bottom: 5px;" >单价：￥{{list.Unit_Price}} </div>
<div style="margin-bottom: 5px;" v-if='item.OrderType == 1'>入店时间：{{list.StartDate}} - {{list.EndDate}}</div>
<div style="margin-bottom: 5px;" v-if='item.OrderType == 4'>
上车地点：{{list.DepartAddress}} <span style='margin:0 5px'></span> 下车地点：{{list.ArriveAddress}}</div>
<div style="margin-bottom: 5px;" v-if='item.OrderType == 4'> </div>
<div style="margin-bottom: 5px;"> <div style="margin-bottom: 5px;">
<span style="margin-right: 10px;"> <span style="margin-right: 10px;" v-if='item.OrderType == 1'>到店时间：{{list.ArrivalTime}} </span>
出发时间：{{list.TripSTime}} <span style="margin-right: 10px;" v-if='item.OrderType == 2'>就餐时间：{{list.Date}} </span>
</span> <span style="margin-right: 10px;" v-if='item.OrderType == 3'>入园时间：{{list.Date}} </span>
</div> <span style="margin-right: 10px;" v-if='item.OrderType == 4'>出行时间：{{list.Date}} {{list.DepartureTime}} </span>
<div style=" display: flex;flex-direction: row;align-items: center;"
v-if="list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0">
<span>赞羊小计：￥{{list.SmallShopsCostPrice}}</span>
</div> </div>
</div> </div>
<div flex="dir:left box:mean" style="width: 350px;"> <div flex="dir:left box:mean" style="width: 350px;">
<div flex="cross:center main:center" <div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;"> style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<span style="cursor:pointer">小计：￥{{list.Final_Price}} <span style="cursor:pointer">小计：￥{{item.Income}}
<img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)" <img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
src="../../../assets/img/userman/edit1.png" alt=""> src="../../../assets/img/userman/edit1.png" alt="">
</span> </span>
<span style="cursor:pointer">商品成本：￥{{ list.CostMoney}} <span style="cursor:pointer">成本：￥{{ list.CostMoney}}
<img v-if="item.OrderStatus!==7" @click="costBtn(list,1)" <img v-if="item.OrderStatus!==4" @click="costBtn(list,1)"
src="../../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer"> 保险成本：￥{{list.InsuranceCostMoney}}
<img v-if="item.OrderStatus!==7" @click="costBtn2(list,2)"
src="../../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">供应商：{{list.SupplierName !=null ? list.SupplierName :''}}
<img v-if="item.OrderStatus!==7" @click="UpdateSuplier(list)"
src="../../../assets/img/userman/edit1.png" alt=""> src="../../../assets/img/userman/edit1.png" alt="">
</span> </span>
<span style="cursor:pointer" v-if='item.OrderType == 4 && list.PeopleNumber && list.PeopleNumber>0'>成人：{{ list.PeopleNumber}}人</span>
<span style="cursor:pointer" v-if='item.OrderType == 4 && list.ChildNumber && list.ChildNumber>0'>儿童：{{ list.ChildNumber}}人 </span>
<div v-if='item.OrderType ==1 '>
<el-table
:data="item.HotelList[0].PriceList"
border
style="width: 100%">
<el-table-column
prop="Date"
label="日期"
width="180">
</el-table-column>
<el-table-column
prop="B2BPrice"
label="b2b价格"
width="180">
</el-table-column>
</el-table>
</div>
</div> </div>
<div flex="cross:center main:center" style="width: 45px;">人数：x {{list.Number}}</div>
</div> </div>
<div style="width: 200px; display: flex;flex-direction:column;justify-content: center" <div style="width: 200px; display: flex;flex-direction:column;justify-content: center"
v-if="TenantId==1"> v-if="TenantId==1">
<el-dropdown trigger="click" style="margin-left: 50px">
<span class="el-dropdown-link">制单</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goCollection(item,list)">
收入制单
</el-dropdown-item>
<el-dropdown-item @click.native="goPayment(item,list)">
付款制单
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<div style="margin-top: 10px;font-size: 12px"
v-if="list.YSMoney!=0 || list.RealMoney!=0 || list.YFMoney!=0 || list.PayMoney!=0">
其他费用：
</div>
<div style="font-size: 12px" v-if="list.YSMoney!=0 || list.RealMoney!=0"> <div style="font-size: 12px" v-if="list.YSMoney!=0 || list.RealMoney!=0">
<span>应收：￥{{list.YSMoney}}</span> <span>应收：￥{{list.YSMoney}}</span>
<span style="margin-left: 10px">实收：￥{{list.RealMoney}}</span> <span style="margin-left: 10px">实收：￥{{list.RealMoney}}</span>
...@@ -235,35 +213,6 @@ ...@@ -235,35 +213,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="billStyle"
v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) && TenantId==1">
<div class="billStyle_item" style="border-right: 1px solid #EBEEF5">
收入单据:
<span v-for="(item,index2) in list.SFinanceList" :key="index2" @click="goSF(item)">
<span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&& item.Is_Cashier!=1"
:style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1"
:style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
</span>
</div>
<div class="billStyle_item">
支出单据:
<span v-for="(item,index2) in list.ZFinanceList" :key="index2" @click="goZF(item)">
<span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1 && item.Is_Cashier!=1"
:style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1"
:style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
</span>
</div>
</div>
</div> </div>
</div> </div>
<div flex="cross:center" class="app-order-info" style="width: 15%;"> <div flex="cross:center" class="app-order-info" style="width: 15%;">
...@@ -274,31 +223,9 @@ ...@@ -274,31 +223,9 @@
<img slot="reference" src="../../../assets/img/userman/price.png" alt=""> <img slot="reference" src="../../../assets/img/userman/price.png" alt="">
</el-popover> </el-popover>
</div> </div>
<div class="express-price"><span>
<span style="color: rgb(144, 147, 153);">(含保险￥{{item.InsuranceMoney}})
</span>
</span></div>
<div> <div>
<el-tag effect="dark" type="warning" size="mini">{{item.PaymentWayName}}</el-tag> <el-tag effect="dark" type="warning" size="mini">{{item.PaymentWayName}}</el-tag>
</div> </div>
<div style="font-size: 12px" v-if="item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0">
<span>优惠金额:￥{{item.CouponMoney}}</span>
</div>
<div style="font-size: 12px"
v-if="item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0">
<span>积分抵用金额:￥{{item.IntegralMoney}}</span>
</div>
<div style="font-size: 12px"
v-if="item.IntegralNumber&& item.IntegralNumber!=''&& item.IntegralNumber>0">
<span>积分数:￥{{item.IntegralNumber}}</span>
</div>
<div style="font-size: 12px"
v-if="item.MemberDiscountCouponList && item.MemberDiscountCouponList.length>0">
<span>优惠券信息:</span>
<span v-for="(MItem,Mindex) in item.MemberDiscountCouponList" :key="Mindex">
{{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
</span>
</div>
</div> </div>
</div> </div>
<div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;"> <div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;">
...@@ -306,7 +233,7 @@ ...@@ -306,7 +233,7 @@
<template v-if="msg.Recycled==2"> <template v-if="msg.Recycled==2">
<!-- 待确认 --> <!-- 待确认 -->
<el-tooltip class="item" effect="dark" content="确认" placement="top" v-if="item.OrderStatus==2"> <el-tooltip class="item" effect="dark" content="确认" placement="top" v-if="item.OrderStatus==2">
<img v-if="item.OrderStatus==2" @click="qrEnd(item,1)" class="app-order-icon" <img v-if="item.OrderStatus==2" @click="qrEnd(item,2)" class="app-order-icon"
src="../../../assets/img/userman/pass.png" alt=""> src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip> </el-tooltip>
<!-- 待出行 --> <!-- 待出行 -->
...@@ -331,22 +258,17 @@ ...@@ -331,22 +258,17 @@
</template> </template>
<!-- 回收站 --> <!-- 回收站 -->
<el-tooltip class="item" effect="dark" content="恢复订单" placement="top"> <el-tooltip class="item" effect="dark" content="恢复订单" placement="top">
<img @click="fRhsz(item,7)" v-if="msg.Recycled==1" class="app-order-icon" <img @click="fRhsz(item,4)" v-if="msg.Recycled==1" class="app-order-icon"
src="../../../assets/img/userman/renew.png" alt=""> src="../../../assets/img/userman/renew.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除订单" placement="top"> <el-tooltip class="item" effect="dark" content="删除订单" placement="top">
<img @click="DeleteOrder(item)" v-if="msg.Recycled==1" class="app-order-icon" <img @click="fRhsz(item,5)" v-if="msg.Recycled==1" class="app-order-icon"
src="../../../assets/img/userman/del.png" alt=""> src="../../../assets/img/userman/del.png" alt="">
</el-tooltip> </el-tooltip>
<template v-if="msg.Recycled==2"> <template v-if="msg.Recycled==2">
<el-tooltip class="item" effect="dark" content="打印小票" placement="top">
<img class="app-order-icon" src="../../../assets/img/userman/print.png" alt=""> <el-tooltip class="item" effect="dark" content="备注" placement="top">
</el-tooltip> <img @click="fRhsz(item,1)" class="app-order-icon"
<el-tooltip class="item" effect="dark" content="打印发货单" placement="top">
<img class="app-order-icon" src="../../../assets/img/userman/invoice.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top">
<img @click="OrderExit(item,1)" class="app-order-icon"
src="../../../assets/img/userman/add_remark.png" alt=""> src="../../../assets/img/userman/add_remark.png" alt="">
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -360,15 +282,12 @@ ...@@ -360,15 +282,12 @@
<div class="card-footer"> <div class="card-footer">
<div> <div>
<div flex="dir:left"> <div flex="dir:left">
<div class="address-box">联系人: {{item.Consignee}} 电话：{{item.Mobile}} <div class="address-box">联系人: {{item.Consignee}} 电话：{{item.Mobile}} </div>
出发地：{{item.ShoppingAddress}}
{{item.DetailList[0].CarType!=5 ?('目的地：'+item.DestinationAddress):''}}
</div>
<button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button" <button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button"
class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button> class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
</div> </div>
</div> </div>
<div v-if="item.Remark && item.Remark!=''" class="seller-remark">商家备注：{{item.Remark}}</div> <div v-if="item.Remark && item.Remark!=''" class="seller-remark">备注：{{item.Remark}}</div>
</div> </div>
</el-card> </el-card>
<el-card v-if="tableData.length==0" class="app-order-item" shadow="never"> <el-card v-if="tableData.length==0" class="app-order-item" shadow="never">
...@@ -407,8 +326,8 @@ ...@@ -407,8 +326,8 @@
</el-dialog> </el-dialog>
<!--待处理--> <!--待处理-->
<el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%" class="tyi"> <el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%" class="tyi">
<el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"> <el-input v-if="pendMgs.Type==1" type="text" size="small" v-model="pendMgs.RefundMoney" placeholder="退款金额"></el-input>
</el-input> <el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"></el-input>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="pendD = false">取 消</el-button> <el-button size="small" @click="pendD = false">取 消</el-button>
<el-button size="small" type="primary" @click="pendingForm()">确 定</el-button> <el-button size="small" type="primary" @click="pendingForm()">确 定</el-button>
...@@ -547,6 +466,9 @@ ...@@ -547,6 +466,9 @@
<span style="font-size:20px">提示</span> <span style="font-size:20px">提示</span>
</p> </p>
<p class="center" style="padding: 10px 15px;">{{hstips}}</p> <p class="center" style="padding: 10px 15px;">{{hstips}}</p>
<el-input size="small" v-if='hszMsg.Type == 1' v-model="hszMsg.Remark"></el-input>
<div style="text-align:center;margin-top:20px"> <div style="text-align:center;margin-top:20px">
<el-button size="small" @click="hszDig=fasle">取消</el-button> <el-button size="small" @click="hszDig=fasle">取消</el-button>
<el-button size="small" type="primary" @click="hszOk">确定</el-button> <el-button size="small" type="primary" @click="hszOk">确定</el-button>
...@@ -723,25 +645,30 @@ ...@@ -723,25 +645,30 @@
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
Name: '', OrderSource:0,
OrderSource: 0,
OrderType: 0, OrderType: 0,
DeliveryMethod: 0,
OrderId: 0, OrderId: 0,
StartTime: '', StartTime: '',
EndTime: '', EndTime: '',
OrderStatus: 0, OrderStatus: 0,
OrderNo: '', OrderNo: '',
MerchantsNo: '',
UserName: '', UserName: '',
UserId: '', UserId: '',
GoodsName: '',
Consignee: '', Consignee: '',
Mobile: '', Mobile: '',
ProductCode: '', ProductCode: '',
Recycled: 2, Recycled: 2,
AnchorName: '',
IsSelectPayMoney: 0, // DeliveryMethod: 0,
// Name: '',
// MerchantsNo: '',
// GoodsName: '',
// ProductCode: '',
// AnchorName: '',
// IsSelectPayMoney: 0,
}, },
IsSelectPayMoney: 0, IsSelectPayMoney: 0,
platList: [], platList: [],
...@@ -751,32 +678,22 @@ ...@@ -751,32 +678,22 @@
}, },
{ {
Id: 2, Id: 2,
name: '商户单号' name: '用户名'
}, },
{ {
Id: 3, Id: 3,
name: '用户名' name: '用户ID'
}, },
{ {
Id: 4, Id: 4,
name: '用户ID' name: '联系人'
}, },
{ {
Id: 5, Id: 5,
name: '商品名称' name: '联系电话'
},
{
Id: 6,
name: '收货人'
},
{
Id: 7,
name: '收货人电话'
},
{
Id: 8,
name: '商品货号'
}, },
], ],
msgId: 1, msgId: 1,
ExpressList: [], ExpressList: [],
...@@ -813,8 +730,8 @@ ...@@ -813,8 +730,8 @@
this.msg.UserId = Number(this.$route.query.UserId) this.msg.UserId = Number(this.$route.query.UserId)
} }
this.getList(); this.getList();
this.getplat(); // this.getplat();
this.getExpressInfo(); // this.getExpressInfo();
this.getProvince(); this.getProvince();
this.getDown(); this.getDown();
this.getOrderStatus(); this.getOrderStatus();
...@@ -872,81 +789,40 @@ ...@@ -872,81 +789,40 @@
ChangeId(val) { ChangeId(val) {
let msgVal = this.msgVal; let msgVal = this.msgVal;
if (val == 1) { if (val == 1) {
this.msg.OrderNo = msgVal; this.msg.OrderNo = msgVal;
this.msg.MerchantsNo = '';
this.msg.UserName = ''; this.msg.UserName = '';
this.msg.UserId = ''; this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = '';
} else if (val == 2) { } else if (val == 2) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = msgVal;
this.msg.UserName = '';
this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = '';
this.msg.Mobile = '';
this.msg.ProductCode = '';
} else if (val == 3) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = msgVal; this.msg.UserName = msgVal;
this.msg.UserId = ''; this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = ''; } else if (val == 3) {
} else if (val == 4) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = ''; this.msg.UserName = '';
this.msg.UserId = msgVal; this.msg.UserId = msgVal;
this.msg.GoodsName = '';
this.msg.Consignee = '';
this.msg.Mobile = '';
this.msg.ProductCode = '';
} else if (val == 5) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = '';
this.msg.UserId = '';
this.msg.GoodsName = msgVal;
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = ''; } else if (val == 4) {
} else if (val == 6) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = ''; this.msg.UserName = '';
this.msg.UserId = ''; this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = msgVal; this.msg.Consignee = msgVal;
this.msg.Mobile = ''; this.msg.Mobile = '';
this.msg.ProductCode = ''; } else if (val == 5) {
} else if (val == 7) {
this.msg.OrderNo = ''; this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = ''; this.msg.UserName = '';
this.msg.UserId = ''; this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = ''; this.msg.Consignee = '';
this.msg.Mobile = msgVal; this.msg.Mobile = msgVal;
this.msg.ProductCode = '';
} else if (val == 8) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = '';
this.msg.UserId = '';
this.msg.GoodsName = '';
this.msg.Consignee = '';
this.msg.Mobile = '';
this.msg.ProductCode = msgVal;
} }
}, },
hszOk() { hszOk() {
this.lxymallapipost('/api/order/SetOrderOperation', this.hszMsg, this.lxymallapipost('/api/DmcOrder/SetDmcOrderOperation', this.hszMsg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
...@@ -965,13 +841,14 @@ ...@@ -965,13 +841,14 @@
this.pendMgs.OrderId = item.OrderId; this.pendMgs.OrderId = item.OrderId;
this.pendMgs.Type = type; this.pendMgs.Type = type;
this.pendMgs.Remark = ''; this.pendMgs.Remark = '';
this.pendMgs.RefundMoney = item.PreferPrice;
}, },
// 待处理调用接口 // 待处理调用接口
pendingForm() { pendingForm() {
this.loading = true; this.loading = true;
this.lxymallapipost('/api/order/SetOrderApplyForCancelAudit', this.pendMgs, this.lxymallapipost('/api/DmcOrder/SetDmcOrderCancelAudit', this.pendMgs,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.pendD = false; this.pendD = false;
...@@ -1007,7 +884,7 @@ ...@@ -1007,7 +884,7 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.lxymallapipost('/api/order/SetSDOrderConfirm', msg, this.lxymallapipost('/api/DmcOrder/SetDmcOrderOperation', msg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
...@@ -1025,15 +902,24 @@ ...@@ -1025,15 +902,24 @@
}, },
// 放入回收站 // 放入回收站
fRhsz(item, num) { fRhsz(item, num) {
if (num == 4) { let Remark = ''
if (num == 1) {
this.hstips = "备注修改?"
Remark = item.Remark
}
if (num == 3) {
this.hstips = "是否放入回收站(可在回收站中恢复)?" this.hstips = "是否放入回收站(可在回收站中恢复)?"
} }
if (num == 7) { if (num == 4) {
this.hstips = "是否移出回收站?" this.hstips = "是否移出回收站?"
}
if (num == 5) {
this.hstips = "是否删除?"
} }
this.hszMsg = { this.hszMsg = {
OrderId: item.OrderId, OrderId: item.OrderId,
Type: num Type: num,
Remark:Remark
}; };
this.hszDig = true; this.hszDig = true;
}, },
...@@ -1325,7 +1211,7 @@ ...@@ -1325,7 +1211,7 @@
that.Confirm(text, function () { that.Confirm(text, function () {
that.loading = true that.loading = true
that.lxymallapipost( that.lxymallapipost(
"/api/order/SetOrderForcedToCancel", { "/api/DmcOrder/SetDmcOrderCancel", {
OrderId: item.OrderId OrderId: item.OrderId
}, },
res => { res => {
...@@ -1360,41 +1246,39 @@ ...@@ -1360,41 +1246,39 @@
getList() { getList() {
let that = this; let that = this;
that.ChangeId(that.msgId); that.ChangeId(that.msgId);
if (!this.msgVal || this.msgVal == '') { if (!that.msgVal || that.msgVal == '') {
this.msg.OrderNo = ''; that.msg.OrderNo = '';
this.msg.MerchantsNo = ''; that.msg.UserName = '';
this.msg.UserName = ''; that.msg.UserId = '';
this.msg.UserId = ''; that.msg.Consignee = '';
this.msg.GoodsName = ''; that.msg.Mobile = '';
this.msg.Consignee = '';
this.msg.Mobile = '';
this.msg.ProductCode = '';
} }
this.msg.IsSelectPayMoney = Number(this.IsSelectPayMoney) if (that.dateList && that.dateList.length > 0) {
if (this.dateList && this.dateList.length > 0) { that.msg.StartTime = that.dateList[0];
this.msg.StartTime = this.dateList[0]; that.msg.EndTime = that.dateList[1];
this.msg.EndTime = this.dateList[1];
} else { } else {
this.msg.StartTime = ''; that.msg.StartTime = '';
this.msg.EndTime = ''; that.msg.EndTime = '';
} }
this.loading = true; that.loading = true;
this.lxymallapipost("/api/order/GetSDGoodsOrderPageList", this.msg, res => { that.lxymallapipost("/api/DmcOrder/GeDmcOrderCommonPageList", that.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; console.log(res.data.data,'res.data.data')
let pageData = res.data.data.pageData; that.loading = false;
this.tableData = pageData; that.total = res.data.data.count;
let pageData = res.data.data.pageData;
that.tableData = pageData;
this.$forceUpdate()
} }
}) })
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
getOrderStatus() { getOrderStatus() {
this.lxymallapipost("/api/GuideCar/GuidCarOrderStatusEnumList", {}, res => { this.lxymallapipost("/api/DmcOrder/GetOrderStatusEnumList", {}, res => {
this.orderStatusList = res.data.data; this.orderStatusList = res.data.data;
}) })
}, },
...@@ -1404,14 +1288,14 @@ ...@@ -1404,14 +1288,14 @@
}) })
}, },
getOrderType() { getOrderType() {
this.lxymallapipost("/api/order/GetOrderTypeEnumList", {}, res => { this.lxymallapipost("/api/DmcOrder/GetOrderTypeEnumList", {}, res => {
this.orderTypeList = res.data.data; this.orderTypeList = res.data.data;
}) })
}, },
getplat() { getplat() {
this.lxymallapipost("/api/user/GetMemberUserSourceEnumList", {}, res => { this.lxymallapipost("/api/DmcOrder/GetUserSourceEnumList", {}, res => {
this.platList = res.data.data; this.platList = res.data.data;
}) })
}, },
...@@ -1584,6 +1468,19 @@ ...@@ -1584,6 +1468,19 @@
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' + window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj)) JSON.stringify(orderObj))
}, },
getshangplist(item){
let List = [];
if(item.OrderType==1){
List = item.HotelList
}else if(item.OrderType==2){
List = item.DiningList
}else if(item.OrderType==3){
List = item.TicketList
}else if(item.OrderType==4){
List = item.CarList
}
return List
},
goPayment(item, list) { //跳到erp付款单 goPayment(item, list) { //跳到erp付款单
let currentUser = this.getLocalStorage() let currentUser = this.getLocalStorage()
let companyID = currentUser.ERPBranchId != 0 ? currentUser.ERPBranchId : 1224; let companyID = currentUser.ERPBranchId != 0 ? currentUser.ERPBranchId : 1224;
......
src/router/config.js
View file @ cfe99384
...@@ -2691,6 +2691,15 @@ export default { ...@@ -2691,6 +2691,15 @@ export default {
title: '线路报价' title: '线路报价'
}, },
}, },
{
path: '/traveorderdetails', //定制包车=>订单详情
name: 'traveorderdetails',
component: resolve => require(['@/components/TravelManager/customizedcar/traveorderdetails'], resolve),
meta: {
title: '线路报价'
},
},
......
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