Commit 73cb3cab authored by 黄奎's avatar 黄奎

1

parent b88fd442
<template> <template>
<div class="directorOrderDetails"> <div class="directorOrderDetails">
<div class="head-title"> <div class="head-title">
<span @click="CommonJump('directorOrderList')" class="blue point">订单列表</span> / 订单详情 <span @click="gobaclk()" class="blue point">订单列表</span> / 订单详情
</div> </div>
<div class="content app-order-detail"> <div class="content app-order-detail">
<el-card class="app-order-status" shadow="never"> <el-card class="app-order-status" shadow="never">
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
</button> </button>
</div> </div>
</div> </div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.DetailList[0].CarType!=5"> <div flex="dir:left cross:center" class="item-box" v-if="dataInfo.DetailList.length>0 && dataInfo.DetailList[0].CarType!=5">
<span class="label">目的地:</span> <span class="label">目的地:</span>
<div class="express-address"> <div class="express-address">
{{dataInfo.OrderInfo.DestinationAddress}} {{dataInfo.OrderInfo.DestinationAddress}}
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-card style="margin-top:15px" shadow="never"> <el-card style="margin-top:15px" shadow="never">
<el-table border :data="dataInfo.DetailList" style="width: 100%"> <el-table border :data="dataInfo.DetailList" style="width: 100%">
<el-table-column prop="Id" label="商品标题"> <el-table-column prop="Id" label="商品标题">
<template slot-scope="scope"> <template slot-scope="scope">
<div flex="dir:left cross:center"> <div flex="dir:left cross:center">
...@@ -344,10 +344,6 @@ ...@@ -344,10 +344,6 @@
</el-form> </el-form>
</el-card> </el-card>
<div flex="dir:right" class="action-box"> <div flex="dir:right" class="action-box">
<el-button v-if="(activeStep==2 || activeStep==3) && !exitState" style="margin-left: 10px;" size="small"
type="primary">打印发货单</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary">打印小票</el-button>
<el-button @click="qrEnd(dataInfo,3)" v-if="activeStep==4 && !exitState" style="margin-left: 10px;" size="small" <el-button @click="qrEnd(dataInfo,3)" v-if="activeStep==4 && !exitState" style="margin-left: 10px;" size="small"
type="primary">确认完成</el-button> type="primary">确认完成</el-button>
<el-button @click="qrEnd(dataInfo,2)" v-if="activeStep==3 && !exitState" style="margin-left: 10px;" <el-button @click="qrEnd(dataInfo,2)" v-if="activeStep==3 && !exitState" style="margin-left: 10px;"
...@@ -818,6 +814,9 @@ ...@@ -818,6 +814,9 @@
} }
}) })
}, },
gobaclk(){
this.$router.go(-1);//返回上一层
}
}, },
mounted() { mounted() {
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<!-- <div> <!-- <div>
<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> -->
<div style="display: flex;flex-direction: row;align-items: center;font-size: 12px" v-if="TenantId==1"> <div style="display: flex;flex-direction: row;align-items: center;font-size: 12px" v-if="TenantId==1">
<div class="fkbox"> <div class="fkbox">
<div class="fkbox_item" style="background: #00FFFF"></div> <div class="fkbox_item" style="background: #00FFFF"></div>
...@@ -63,7 +63,7 @@ ...@@ -63,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">
...@@ -80,202 +80,202 @@ ...@@ -80,202 +80,202 @@
</div> </div>
<div 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 v-if="item.OrderType!=5">
<div flex="cross:center" class="app-order-head"> <div slot="header" class="clearfix">
<div class="app-order-time">{{item.CreateDate}}</div> <div flex="cross:center" class="app-order-head">
<div class="app-order-user"> <div class="app-order-time">{{item.CreateDate}}</div>
<span class="app-order-time" style="margin-right: 5px">订单号:</span>{{item.OrderNo}}({{item.OrderId}}) <div class="app-order-user">
<el-tag v-if="item.OrderSource==1" size="small">{{item.OrderTypeName}}</el-tag> <span class="app-order-time" style="margin-right: 5px">订单号:</span>{{item.OrderNo}}({{item.OrderId}})
<el-tag v-if="item.OrderSource==2" size="small" type="success">{{item.OrderTypeName}}</el-tag> <el-tag v-if="item.OrderSource==1" size="small">{{item.OrderTypeName}}</el-tag>
<el-tag v-if="item.OrderSource==3" size="small" type="info">{{item.OrderTypeName}}</el-tag> <el-tag v-if="item.OrderSource==2" size="small" type="success">{{item.OrderTypeName}}</el-tag>
<el-tag v-if="item.OrderSource==4" size="small" type="warning">{{item.OrderTypeName}}</el-tag> <el-tag v-if="item.OrderSource==3" size="small" type="info">{{item.OrderTypeName}}</el-tag>
<el-tag v-if="item.OrderSource==5" size="small" type="danger">{{item.OrderTypeName}}</el-tag> <el-tag v-if="item.OrderSource==4" size="small" type="warning">{{item.OrderTypeName}}</el-tag>
<el-tag v-if="item.OrderSource==6" size="small" type="danger">{{item.OrderTypeName}}</el-tag> <el-tag v-if="item.OrderSource==5" size="small" type="danger">{{item.OrderTypeName}}</el-tag>
</div> <el-tag v-if="item.OrderSource==6" size="small" type="danger">{{item.OrderTypeName}}</el-tag>
</div>
<div flex="cross:center" class="app-order-user">
<img v-if="item.OrderSource==1" src="../../../assets/img/userman/wx.png" alt=""> <div flex="cross:center" class="app-order-user">
<span>{{item.UserName}}({{item.UserId}})</span> <img v-if="item.OrderSource==1" src="../../../assets/img/userman/wx.png" alt="">
</div> <span>{{item.UserName}}({{item.UserId}})</span>
<div v-if="item.BuyerMessage && item.BuyerMessage!=''" flex="cross:center" class="remark-box"> </div>
<el-tooltip class="item" effect="dark" :content="item.BuyerMessage" placement="top"> <div v-if="item.BuyerMessage && item.BuyerMessage!=''" flex="cross:center" class="remark-box">
<img src="../../../assets/img/userman/remark.png" alt=""> <el-tooltip class="item" effect="dark" :content="item.BuyerMessage" placement="top">
</el-tooltip> <img src="../../../assets/img/userman/remark.png" alt="">
</el-tooltip>
</div>
<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.OrderStatus== 2 " style="margin-left:5px" size="small" type="success">待确认</el-tag>
<!-- <el-tag
v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
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"
type="success">出行中</el-tag>
<el-tag v-if="item.ReceivingTime!='' && 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==4" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
</div>
<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"
class="app-order-btnimg" src="../../../assets/img/userman/force.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">
<img v-if="msg.Recycled!=1" @click="fRhsz(item,3)" class="app-order-btnimg"
src="../../../assets/img/userman/del1.png" alt="">
</el-tooltip>
</div> </div>
<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.OrderStatus== 2 " style="margin-left:5px" size="small" type="success">待确认</el-tag>
<!-- <el-tag
v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
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"
type="success">出行中</el-tag>
<el-tag v-if="item.ReceivingTime!='' && 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==4" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
</div>
<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"
class="app-order-btnimg" src="../../../assets/img/userman/force.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">
<img v-if="msg.Recycled!=1" @click="fRhsz(item,3)" class="app-order-btnimg"
src="../../../assets/img/userman/del1.png" alt="">
</el-tooltip>
</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 getshangplist(item)" :key="index2" class="goods">
<div v-for="(list,index2) in getshangplist(item)" :key="index2" class="goods"> <div >
<div > <img :src="list.HotelImage" v-if='item.OrderType == 1' class="goods-image" />
<el-image :src="list.HotelImage" v-if='item.OrderType == 1' class="goods-image" :preview-src-list="[list.HotelImage]"></el-image> <img :src="list.DiningImg" v-if='item.OrderType == 2' class="goods-image" />
<el-image :src="list.DiningImg" v-if='item.OrderType == 2' class="goods-image" :preview-src-list="[list.DiningImg]"></el-image> <img :src="list.TicketImg" v-if='item.OrderType == 3' class="goods-image" />
<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 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 v-if='item.OrderType == 1'>{{list.HotelName}}</span>
<span v-if='item.OrderType == 1'>{{list.HotelName}}</span> <span v-if='item.OrderType == 2'>{{list.MealName}}</span>
<span v-if='item.OrderType == 2'>{{list.MealName}}</span> <span v-if='item.OrderType == 3'>{{list.TicketName}}</span>
<span v-if='item.OrderType == 3'>{{list.TicketName}}</span> <span v-if='item.OrderType == 4'>{{list.StartCityName}} - {{list.ArriveCityName}}</span>
<span v-if='item.OrderType == 4'>{{list.StartCityName}} - {{list.ArriveCityName}}</span> </div>
</div> </div>
</div> </div>
</div> <div style="margin-bottom: 5px;">
<div style="margin-bottom: 5px;"> <span style="margin-right: 10px;" v-if='item.OrderType == 1'>房间数:x{{list.RoomNumber}}</span>
<span style="margin-right: 10px;" v-if='item.OrderType == 1'>房间数:x{{list.RoomNumber}}</span> <span style="margin-right: 10px;" v-if='item.OrderType == 2 || item.OrderType == 3'>数量:x{{list.PeopleNumber}}</span>
<span style="margin-right: 10px;" v-if='item.OrderType == 2 || item.OrderType == 3'>数量:x{{list.PeopleNumber}}</span> </div>
</div> <div style="margin-bottom: 5px;" >单价:¥{{list.Unit_Price}} </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 == 1'>入店时间:{{list.StartDate}} - {{list.EndDate}}</div> <div style="margin-bottom: 5px;" v-if='item.OrderType == 4'>
<div style="margin-bottom: 5px;" v-if='item.OrderType == 4'> 上车地点:{{list.DepartAddress}} <span style='margin:0 5px'></span> 下车地点:{{list.ArriveAddress}}</div>
上车地点:{{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;" v-if='item.OrderType == 4'> </div> <div style="margin-bottom: 5px;">
<div style="margin-bottom: 5px;"> <span style="margin-right: 10px;" v-if='item.OrderType == 1'>到店时间:{{list.ArrivalTime}} </span>
<span style="margin-right: 10px;" v-if='item.OrderType == 1'>到店时间:{{list.ArrivalTime}} </span> <span style="margin-right: 10px;" v-if='item.OrderType == 2'>就餐时间:{{list.Date}} </span>
<span style="margin-right: 10px;" v-if='item.OrderType == 2'>就餐时间:{{list.Date}} </span> <span style="margin-right: 10px;" v-if='item.OrderType == 3'>入园时间:{{list.Date}} </span>
<span style="margin-right: 10px;" v-if='item.OrderType == 3'>入园时间:{{list.Date}} </span> <span style="margin-right: 10px;" v-if='item.OrderType == 4'>出行时间:{{list.Date}} {{list.DepartureTime}} </span>
<span style="margin-right: 10px;" v-if='item.OrderType == 4'>出行时间:{{list.Date}} {{list.DepartureTime}} </span>
</div>
</div>
<div flex="dir:left box:mean" style="width: 350px;">
<div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<span style="cursor:pointer">小计:¥{{item.Income}}
<img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
src="../../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">成本:¥{{ list.CostMoney}}
<img v-if="item.OrderStatus!==4" @click="costBtn(list,1)"
src="../../../assets/img/userman/edit1.png" alt="">
</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%;font-size:12px;">
<el-table-column
prop="Date"
label="日期"
width="120">
</el-table-column>
<el-table-column
prop="B2BPrice"
label="b2b价格"
width="120">
</el-table-column>
</el-table>
</div> </div>
</div> </div>
</div> <div flex="dir:left box:mean" style="width: 350px;">
<div style="width: 200px; display: flex;flex-direction:column;justify-content: center" <div flex="cross:center main:center"
v-if="TenantId==1"> style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<div style="font-size: 12px" v-if="list.YSMoney!=0 || list.RealMoney!=0"> <span style="cursor:pointer">小计:¥{{item.Income}}
<span>应收:¥{{list.YSMoney}}</span> <img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
<span style="margin-left: 10px">实收:¥{{list.RealMoney}}</span> src="../../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">成本:¥{{ list.CostMoney}}
<img v-if="item.OrderStatus!==4" @click="costBtn(list,1)"
src="../../../assets/img/userman/edit1.png" alt="">
</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%;font-size:12px;">
<el-table-column
prop="Date"
label="日期"
width="120">
</el-table-column>
<el-table-column
prop="B2BPrice"
label="b2b价格"
width="120">
</el-table-column>
</el-table>
</div>
</div>
</div> </div>
<div style="font-size: 12px" v-if="list.YFMoney!=0 || list.PayMoney!=0"> <div style="width: 200px; display: flex;flex-direction:column;justify-content: center"
<span>应付:¥{{list.YFMoney}}</span> v-if="TenantId==1">
<span style="margin-left: 10px">实付:¥{{list.PayMoney}}</span> <div style="font-size: 12px" v-if="list.YSMoney!=0 || list.RealMoney!=0">
<span>应收:¥{{list.YSMoney}}</span>
<span style="margin-left: 10px">实收:¥{{list.RealMoney}}</span>
</div>
<div style="font-size: 12px" v-if="list.YFMoney!=0 || list.PayMoney!=0">
<span>应付:¥{{list.YFMoney}}</span>
<span style="margin-left: 10px">实付:¥{{list.PayMoney}}</span>
</div>
</div> </div>
</div> </div>
</div> </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%;"> <div flex="dir:top">
<div flex="dir:top"> <div>
<div> <span style="font-size: 16px;">{{item.Income}}</span>
<span style="font-size: 16px;">{{item.Income}}</span> <el-popover placement="bottom" width="200" trigger="hover" :content="'商品小计 '+ item.Income +'元'">
<el-popover placement="bottom" width="200" trigger="hover" :content="'商品小计 '+ item.Income +'元'"> <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>
<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>
</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%;"> <div flex="wrap:wrap cross:center">
<div flex="wrap:wrap cross:center"> <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,2)" 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> <!-- 待出行 -->
<!-- 待出行 --> <el-tooltip class="item" effect="dark" content="确认出行" placement="top" v-if="item.OrderStatus==3">
<el-tooltip class="item" effect="dark" content="确认出行" placement="top" v-if="item.OrderStatus==3"> <img @click="qrEnd(item,2)" v-if="item.OrderStatus==3" class="app-order-icon"
<img @click="qrEnd(item,2)" v-if="item.OrderStatus==3" class="app-order-icon" src="../../../assets/img/userman/pass.png" alt="">
src="../../../assets/img/userman/pass.png" alt=""> </el-tooltip>
<!--待处理-->
<el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==5">
<img @click="pending(item,1)" v-if="item.OrderStatus==5" class="app-order-icon"
src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus==5">
<img @click="pending(item,2)" v-if="item.OrderStatus==5" class="app-order-icon"
src="../../../assets/img/userman/nopass.png" alt="">
</el-tooltip>
</template>
<!-- 回收站 -->
<el-tooltip class="item" effect="dark" content="恢复订单" placement="top">
<img @click="fRhsz(item,4)" v-if="msg.Recycled==1" class="app-order-icon"
src="../../../assets/img/userman/renew.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除订单" placement="top">
<!--待处理--> <img @click="fRhsz(item,5)" v-if="msg.Recycled==1" class="app-order-icon"
<el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==6"> src="../../../assets/img/userman/del.png" alt="">
<img @click="pending(item,1)" v-if="item.OrderStatus==6" class="app-order-icon"
src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus==6"> <template v-if="msg.Recycled==2">
<img @click="pending(item,2)" v-if="item.OrderStatus==6" class="app-order-icon"
src="../../../assets/img/userman/nopass.png" alt=""> <el-tooltip class="item" effect="dark" content="添加备注" placement="top">
<img @click="fRhsz(item,1)" class="app-order-icon"
src="../../../assets/img/userman/add_remark.png" alt="">
</el-tooltip>
</template>
<el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
<img @click="CommonJump('traveorderdetails',{OrderId:item.OrderId})" class="app-order-icon"
src="../../../assets/img/userman/detail.png" alt="">
</el-tooltip> </el-tooltip>
</template> </div>
<!-- 回收站 -->
<el-tooltip class="item" effect="dark" content="恢复订单" placement="top">
<img @click="fRhsz(item,4)" v-if="msg.Recycled==1" class="app-order-icon"
src="../../../assets/img/userman/renew.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除订单" placement="top">
<img @click="fRhsz(item,5)" v-if="msg.Recycled==1" class="app-order-icon"
src="../../../assets/img/userman/del.png" alt="">
</el-tooltip>
<template v-if="msg.Recycled==2">
<el-tooltip class="item" effect="dark" content="备注" placement="top">
<img @click="fRhsz(item,1)" class="app-order-icon"
src="../../../assets/img/userman/add_remark.png" alt="">
</el-tooltip>
</template>
<el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
<img @click="CommonJump('traveorderdetails',{OrderId:item.OrderId})" class="app-order-icon"
src="../../../assets/img/userman/detail.png" alt="">
</el-tooltip>
</div> </div>
</div> </div>
</div> <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> <div class="address-box">联系人: {{item.Consignee}} 电话:{{item.Mobile}} </div>
...@@ -283,7 +283,281 @@ ...@@ -283,7 +283,281 @@
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>
<!-- 城际样式 -->
<div v-if="item.OrderType==5">
<div slot="header" class="clearfix">
<div flex="cross:center" class="app-order-head">
<div class="app-order-time">{{item.CreateDate}}</div>
<div class="app-order-user">
<span class="app-order-time" style="margin-right: 5px">订单号:</span>{{item.OrderNo}}({{item.OrderId}})
<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.OrderTypeName}}</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.OrderTypeName}}</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.OrderTypeName}}</el-tag>
</div>
<div flex="cross:center" class="app-order-user">
<img v-if="item.OrderSource==1" src="../../../assets/img/userman/wx.png" alt="">
<span>{{item.UserName}}({{item.UserId}})</span>
</div>
<div v-if="item.BuyerMessage && item.BuyerMessage!=''" flex="cross:center" class="remark-box">
<el-tooltip class="item" effect="dark" :content="item.BuyerMessage" placement="top">
<img src="../../../assets/img/userman/remark.png" alt="">
</el-tooltip>
</div>
<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!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
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"
type="success">待出行</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.ReceivingTime!='' && item.FinishTime==''" style="margin-left:5px" size="small"
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==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
</div>
<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"
class="app-order-btnimg" src="../../../assets/img/userman/force.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">
<img v-if="msg.Recycled!=1" @click="fRhsz2(item,4)" class="app-order-btnimg"
src="../../../assets/img/userman/del1.png" alt="">
</el-tooltip>
</div>
</div>
<div class="app-order-body">
<div class="goods-item" style="width: 65%;">
<div v-for="(list,index2) in item.SDGoodsList" :key="index2" class="goods">
<div>
<img :src="list.CoverImagePath" class="goods-image" />
<div flex="dir:left" style="display:flex">
<div class="goods-info">
<div class="goods-name">
<div class="app-ellipsis">
<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"
style="margin-right: 5px;">
{{list.OrderTypeName}}
</span>
{{list.GoodsName}}
</div>
</div>
</div>
<div style="margin-bottom: 5px;">
<span style="margin-right: 10px;">
车辆:{{list.CarName}}、{{list.CarColorName}}、{{list.CarNumber}}
</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 style="margin-bottom: 5px;">
<span style="margin-right: 10px;">
出发时间:{{list.TripSTime}}
</span>
</div>
<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 flex="dir:left box:mean" style="width: 350px;">
<div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<span style="cursor:pointer">小计:¥{{list.Final_Price}}
<img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
src="../../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">商品成本:¥{{ list.CostMoney}}
<img v-if="item.OrderStatus!==7" @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="">
</span>
</div>
<div flex="cross:center main:center" >人数:x {{list.Number}}</div>
</div>
<div style="width: 200px; display: flex;flex-direction:column;justify-content: center"
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">
<span>应收:¥{{list.YSMoney}}</span>
<span style="margin-left: 10px">实收:¥{{list.RealMoney}}</span>
</div>
<div style="font-size: 12px" v-if="list.YFMoney!=0 || list.PayMoney!=0">
<span>应付:¥{{list.YFMoney}}</span>
<span style="margin-left: 10px">实付:¥{{list.PayMoney}}</span>
</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 flex="cross:center" class="app-order-info" style="width: 15%;">
<div flex="dir:top">
<div>
<span style="font-size: 16px;">¥{{item.Income}}</span>
<el-popover placement="bottom" width="200" trigger="hover" :content="'商品小计 '+ item.Income +'元'">
<img slot="reference" src="../../../assets/img/userman/price.png" alt="">
</el-popover>
</div>
<div class="express-price"><span>
<span style="color: rgb(144, 147, 153);">(含保险¥{{item.InsuranceMoney}})
</span>
</span></div>
<div>
<el-tag effect="dark" type="warning" size="mini">{{item.PaymentWayName}}</el-tag>
</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 class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;">
<div flex="wrap:wrap cross:center">
<template v-if="msg.Recycled==2">
<!-- 待确认 -->
<el-tooltip class="item" effect="dark" content="确认" placement="top" v-if="item.OrderStatus==2">
<img v-if="item.OrderStatus==2" @click="qrEnd2(item,1)" class="app-order-icon"
src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<!-- 待出行 -->
<el-tooltip class="item" effect="dark" content="确认出行" placement="top" v-if="item.OrderStatus==3">
<img @click="qrEnd2(item,2)" v-if="item.OrderStatus==3" class="app-order-icon"
src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<!-- 已收货 -->
<el-tooltip class="item" effect="dark" content="确认完成" placement="top" v-if="item.OrderStatus==4">
<img @click="qrEnd2(item,3)" v-if="item.OrderStatus==4" class="app-order-icon"
src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<!--待处理-->
<el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==5">
<img @click="pending(item,1)" v-if="item.OrderStatus==5" class="app-order-icon"
src="../../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus==5">
<img @click="pending(item,2)" v-if="item.OrderStatus==5" class="app-order-icon"
src="../../../assets/img/userman/nopass.png" alt="">
</el-tooltip>
</template>
<!-- 回收站 -->
<el-tooltip class="item" effect="dark" content="恢复订单" placement="top">
<img @click="fRhsz2(item,7)" v-if="msg.Recycled==1" class="app-order-icon"
src="../../../assets/img/userman/renew.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除订单" placement="top">
<img @click="DeleteOrder(item)" v-if="msg.Recycled==1" class="app-order-icon"
src="../../../assets/img/userman/del.png" alt="">
</el-tooltip>
<template v-if="msg.Recycled==2">
<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="">
</el-tooltip>
</template>
<el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
<img @click="CommonJump('directorOrderDetails',{OrderId:item.OrderId})" class="app-order-icon"
src="../../../assets/img/userman/detail.png" alt="">
</el-tooltip>
</div>
</div>
</div>
<div class="card-footer">
<div>
<div flex="dir:left">
<div class="address-box">联系人: {{item.Consignee}} 电话:{{item.Mobile}}
出发地:{{item.ShoppingAddress}}
{{item.SDGoodsList[0].CarType!=5 ?('目的地:'+item.DestinationAddress):''}}
</div>
<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>
</div>
</div>
<div v-if="item.Remark && item.Remark!=''" class="seller-remark">商家备注:{{item.Remark}}</div>
</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">
...@@ -321,8 +595,13 @@ ...@@ -321,8 +595,13 @@
</span> </span>
</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="20%" class="tyi">
<el-input v-if="pendMgs.Type==1" type="text" size="small" v-model="pendMgs.RefundMoney" placeholder="退款金额"></el-input> <div style="width100%;height:15px"></div>
<div v-if="pendMgs.Type==1 && pendMgs.OrderType!=5">
<span>退款金额</span>
<el-input type="text" size="small" v-model="pendMgs.RefundMoney" placeholder="退款金额"></el-input>
</div>
<el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"></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>
...@@ -366,13 +645,25 @@ ...@@ -366,13 +645,25 @@
<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> <el-input style="margin-left: 10px; width: 400px;" size="small" type="textarea" 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>
</div> </div>
</el-dialog>
<!-- 放入回收站 -->
<el-dialog custom-class="hszDigClass" :visible.sync="hszDig2" width="420px">
<p style="padding: 10px 15px;" class="center">
<i class="el-icon-warning" style="color:#E6A23C;font-size:24px"></i>
<span style="font-size:20px">提示</span>
</p>
<p class="center" style="padding: 10px 15px;">{{hstips}}</p>
<div style="text-align:center;margin-top:20px">
<el-button size="small" @click="hszDig2=fasle">取消</el-button>
<el-button size="small" type="primary" @click="hszOk2">确定</el-button>
</div>
</el-dialog> </el-dialog>
<!-- 订单取消 --> <!-- 订单取消 -->
<el-dialog title="修改价格" :visible.sync="priceDig" width="600px"> <el-dialog title="修改价格" :visible.sync="priceDig" width="600px">
...@@ -437,8 +728,12 @@ ...@@ -437,8 +728,12 @@
</template> </template>
<script> <script>
import intercity from './public/intercity'
export default { export default {
name: "orderList", name: "orderList",
components:{
intercity
},
data() { data() {
return { return {
importFileUrl: this.domainManager().UploadFileUrl, importFileUrl: this.domainManager().UploadFileUrl,
...@@ -610,7 +905,9 @@ ...@@ -610,7 +905,9 @@
moresendDig: false, moresendDig: false,
moresendtips: '', moresendtips: '',
hszDig: false, hszDig: false,
hszDig2: false,
hszMsg: {}, hszMsg: {},
hszMsg2: {},
btnLoad: false, btnLoad: false,
upSupliDilog: false, // 修改供应商弹窗 upSupliDilog: false, // 修改供应商弹窗
SuplierList: [], // 供应商下拉数据 SuplierList: [], // 供应商下拉数据
...@@ -630,9 +927,9 @@ ...@@ -630,9 +927,9 @@
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();
this.getDelivery(); this.getDelivery();
...@@ -735,6 +1032,21 @@ ...@@ -735,6 +1032,21 @@
}, },
null null
); );
},
hszOk2() {
this.lxymallapipost('/api/order/SetOrderOperation', this.hszMsg2,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
this.hszDig = false;
} else {
this.Error(res.data.message);
}
},
null
);
}, },
pending(item, type) { pending(item, type) {
this.pendD = true; this.pendD = true;
...@@ -742,13 +1054,18 @@ ...@@ -742,13 +1054,18 @@
this.pendMgs.Type = type; this.pendMgs.Type = type;
this.pendMgs.Remark = ''; this.pendMgs.Remark = '';
this.pendMgs.RefundMoney = item.PreferPrice; this.pendMgs.RefundMoney = item.PreferPrice;
this.pendMgs.OrderType = item.OrderType;//来判断的否是城际专车 是的话用之前的接口
}, },
// 待处理调用接口 // 待处理调用接口
pendingForm() { pendingForm() {
this.loading = true; this.loading = true;
this.lxymallapipost('/api/DmcOrder/SetDmcOrderCancelAudit', this.pendMgs, let url = '/api/DmcOrder/SetDmcOrderCancelAudit'
if(this.pendMgs.OrderType){
url = '/api/order/SetOrderApplyForCancelAudit'
}
this.lxymallapipost(url, this.pendMgs,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.pendD = false; this.pendD = false;
...@@ -800,11 +1117,47 @@ ...@@ -800,11 +1117,47 @@
}); });
}, },
// 司导的确认完成
qrEnd2(item, num) {
let msg = {
OrderId: item.OrderId,
Type: num
};
let that = this;
let text
if (num == 1) {
text = '是否确定订单?'
} else if (num == 2) {
text = '是否出行?'
} else if (num == 3) {
text = '是否完成该订单?'
}
that.$confirm(text, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.lxymallapipost('/api/order/SetSDOrderConfirm', msg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
},
// 放入回收站 // 放入回收站
fRhsz(item, num) { fRhsz(item, num) {
let Remark = '' let Remark = ''
if (num == 1) { if (num == 1) {
this.hstips = "备注修改?" this.hstips = "备注修改"
Remark = item.Remark Remark = item.Remark
} }
if (num == 3) { if (num == 3) {
...@@ -823,6 +1176,20 @@ ...@@ -823,6 +1176,20 @@
}; };
this.hszDig = true; this.hszDig = true;
}, },
// 城际放入回收站
fRhsz2(item, num) {
if (num == 4) {
this.hstips = "是否放入回收站(可在回收站中恢复)?"
}
if (num == 7) {
this.hstips = "是否移出回收站?"
}
this.hszMsg2 = {
OrderId: item.OrderId,
Type: num
};
this.hszDig2 = true;
},
DeleteOrder(item) { DeleteOrder(item) {
let msg = { let msg = {
OrderId: item.OrderId, OrderId: item.OrderId,
...@@ -1085,9 +1452,6 @@ ...@@ -1085,9 +1452,6 @@
}, },
); );
}); });
}, },
handleClick(val) { handleClick(val) {
let dataId = val.$attrs.dataId; let dataId = val.$attrs.dataId;
...@@ -1119,7 +1483,7 @@ ...@@ -1119,7 +1483,7 @@
that.msg.EndTime = ''; that.msg.EndTime = '';
} }
that.loading = true; that.loading = true;
that.lxymallapipost("/api/DmcOrder/GeDmcOrderCommonPageList", that.msg, res => { that.lxymallapipost("/api/DmcOrder/GeDmcOrderCommonPageList_V2", that.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res.data.data,'res.data.data') console.log(res.data.data,'res.data.data')
that.loading = false; that.loading = false;
......
...@@ -10,14 +10,13 @@ ...@@ -10,14 +10,13 @@
<i :class="activeStep>0?'step01Active':'step01'" slot="icon"></i> <i :class="activeStep>0?'step01Active':'step01'" slot="icon"></i>
</el-step> </el-step>
<template> <template>
<el-step v-if="dataInfo.PaymentTime=='' " title="未付款" icon="el-icon-edit" <el-step v-if="dataInfo.PaymentTime=='' " title="未付款" icon="el-icon-edit">
>
<i :class="activeStep>0?'step02Active':'step02'" slot="icon"></i> <i :class="activeStep>0?'step02Active':'step02'" slot="icon"></i>
</el-step> </el-step>
<el-step v-else title="已付款" icon="el-icon-edit" :description="dataInfo.PaymentTime"> <el-step v-else title="已付款" icon="el-icon-edit" :description="dataInfo.PaymentTime">
<i :class="activeStep>1?'step02Active':'step02'" slot="icon"></i> <i :class="activeStep>1?'step02Active':'step02'" slot="icon"></i>
</el-step> </el-step>
</template> </template>
<template v-if="exitState"> <template v-if="exitState">
<el-step title="已取消" icon="el-icon-edit" :description="dataInfo.CancelTime"> <el-step title="已取消" icon="el-icon-edit" :description="dataInfo.CancelTime">
<i class="stepExit" slot="icon"></i> <i class="stepExit" slot="icon"></i>
...@@ -25,54 +24,58 @@ ...@@ -25,54 +24,58 @@
</template> </template>
<template v-else> <template v-else>
<template> <template>
<el-step v-if="activeStep==5" title="已确定" icon="el-icon-edit" :description="dataInfo.ConfirmTime"> <el-step
v-if="activeStep==5"
title="已确定"
icon="el-icon-edit"
:description="dataInfo.ConfirmTime"
>
<i :class="activeStep==5?'step03Active':'step03'" slot="icon"></i> <i :class="activeStep==5?'step03Active':'step03'" slot="icon"></i>
</el-step> </el-step>
<el-step v-else title="待确定" icon="el-icon-edit" description=""> <el-step v-else title="待确定" icon="el-icon-edit" description>
<i :class="activeStep>2?'step03Active':'step03'" slot="icon"></i> <i :class="activeStep>2?'step03Active':'step03'" slot="icon"></i>
</el-step> </el-step>
</template> </template>
<template> <template>
<el-step v-if="activeStep==5" title="已结束" icon="el-icon-edit" > <el-step v-if="activeStep==5" title="已结束" icon="el-icon-edit">
<i :class="activeStep==5?'step05Active':'step05'" slot="icon"></i> <i :class="activeStep==5?'step05Active':'step05'" slot="icon"></i>
</el-step> </el-step>
</template> </template>
</template> </template>
</el-steps> </el-steps>
</el-card> </el-card>
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="8"> <el-col :span="8">
<div class="card-box"> <div class="card-box">
<h3>订单信息</h3> <h3>订单信息</h3>
<template > <template>
<div flex="dir:left cross:center" class="item-box"> <div flex="dir:left cross:center" class="item-box">
<span class="label">订单号:</span> <span class="label">订单号:</span>
<span>{{dataInfo.OrderNo}}</span> <span>{{dataInfo.OrderNo}}</span>
</div> </div>
<div flex="dir:left cross:center" class="item-box"> <div flex="dir:left cross:center" class="item-box">
<span class="label">来源:</span> <span class="label">来源:</span>
<span class="el-tag el-tag--warning el-tag--small el-tag--light is-hit">{{dataInfo.OrderTypeName}}</span> <span
class="el-tag el-tag--warning el-tag--small el-tag--light is-hit"
>{{dataInfo.OrderTypeName}}</span>
</div> </div>
<div flex="dir:left cross:center" class="item-box"> <div flex="dir:left cross:center" class="item-box">
<span class="label">支付方式:</span> <span class="label">支付方式:</span>
<span <span
class="el-tag el-tag--success el-tag--small el-tag--light is-hit">{{dataInfo.PaymentWayName}}</span> class="el-tag el-tag--success el-tag--small el-tag--light is-hit"
>{{dataInfo.PaymentWayName}}</span>
</div> </div>
<div flex="dir:left cross:center" class="item-box"> <div flex="dir:left cross:center" class="item-box">
<span class="label">联系人:</span> <span class="label">联系人:</span>
<span>{{dataInfo.Consignee}}</span> <span>{{dataInfo.Consignee}}</span>
</div> </div>
<div flex="dir:left cross:center" class="item-box"> <div flex="dir:left cross:center" class="item-box">
<span class="label">电话:</span> <span class="label">电话:</span>
<span>{{dataInfo.Mobile}}</span> <span>{{dataInfo.Mobile}}</span>
</div> </div>
</template> </template>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -82,21 +85,30 @@ ...@@ -82,21 +85,30 @@
<span class="label">商家备注:</span> <span class="label">商家备注:</span>
<span> <span>
{{dataInfo.Remark}} {{dataInfo.Remark}}
<i v-if="activeStep==2 || activeStep==3" @click="OrderExit" class="el-icon-edit" <i
style="color: rgb(64, 158, 255); cursor: pointer; margin-left: 10px;"></i> v-if="activeStep==2 || activeStep==3"
@click="OrderExit"
class="el-icon-edit"
style="color: rgb(64, 158, 255); cursor: pointer; margin-left: 10px;"
></i>
</span> </span>
</div> </div>
<div v-if="dataInfo.BuyerMessage && dataInfo.BuyerMessage!=''" flex="dir:left cross:center" class="item-box" style="flex-shrink: 0;"> <div
v-if="dataInfo.BuyerMessage && dataInfo.BuyerMessage!=''"
flex="dir:left cross:center"
class="item-box"
style="flex-shrink: 0;"
>
<span class="label">买家留言:</span> <span class="label">买家留言:</span>
<span> <span>{{dataInfo.BuyerMessage}}</span>
{{dataInfo.BuyerMessage}}
</span>
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div flex="dir:top" class="card-box"> <div flex="dir:top" class="card-box">
<div v-if="dataInfo.DistributionInfo !=undefined &&dataInfo.DistributionInfo.length>0 && dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length==0"> <div
v-if="dataInfo.DistributionInfo !=undefined &&dataInfo.DistributionInfo.length>0 && dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length==0"
>
<h3>分销信息</h3> <h3>分销信息</h3>
<div v-for="(item,index) in dataInfo.DistributionInfo" :key="index"> <div v-for="(item,index) in dataInfo.DistributionInfo" :key="index">
<div class="share-title"> <div class="share-title">
...@@ -116,9 +128,11 @@ ...@@ -116,9 +128,11 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0"> <div
<h3 >Vip返利</h3> v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0"
<div v-for="(item,index2) in dataInfo.VipCommissionInfo" :key="index2"> >
<h3>Vip返利</h3>
<div v-for="(item,index2) in dataInfo.VipCommissionInfo" :key="index2">
<div class="share-title"> <div class="share-title">
<span>{{item.GradeDescription}}</span> <span>{{item.GradeDescription}}</span>
</div> </div>
...@@ -132,11 +146,12 @@ ...@@ -132,11 +146,12 @@
<div>¥{{item.Commission}}</div> <div>¥{{item.Commission}}</div>
</div> </div>
</div> </div>
</div> </div>
<div v-if="dataInfo.OrderIntroductionInfo!=undefined && dataInfo.OrderIntroductionInfo.length>0"> <div
<h3 >推荐供应商返佣</h3> v-if="dataInfo.OrderIntroductionInfo!=undefined && dataInfo.OrderIntroductionInfo.length>0"
<div v-for="(item,index2) in dataInfo.OrderIntroductionInfo" :key="index2"> >
<h3>推荐供应商返佣</h3>
<div v-for="(item,index2) in dataInfo.OrderIntroductionInfo" :key="index2">
<div flex="dir:left cross:center" class="item-box"> <div flex="dir:left cross:center" class="item-box">
<span class="label">姓名:</span> <span class="label">姓名:</span>
<div>{{item.UserName}}</div> <div>{{item.UserName}}</div>
...@@ -147,11 +162,12 @@ ...@@ -147,11 +162,12 @@
<div>¥{{item.Commission}}</div> <div>¥{{item.Commission}}</div>
</div> </div>
</div> </div>
</div> </div>
<div v-if="dataInfo.SmallShopsCommissionInfo!=undefined && dataInfo.SmallShopsCommissionInfo.length>0"> <div
<h3 >微店佣金</h3> v-if="dataInfo.SmallShopsCommissionInfo!=undefined && dataInfo.SmallShopsCommissionInfo.length>0"
<div v-for="(item,index2) in dataInfo.SmallShopsCommissionInfo" :key="index2"> >
<h3>微店佣金</h3>
<div v-for="(item,index2) in dataInfo.SmallShopsCommissionInfo" :key="index2">
<div class="share-title"> <div class="share-title">
<span>{{item.SmallShopsName}}</span> <span>{{item.SmallShopsName}}</span>
</div> </div>
...@@ -165,119 +181,197 @@ ...@@ -165,119 +181,197 @@
<div>¥{{item.Commission}}</div> <div>¥{{item.Commission}}</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<!-- 酒店 -->
<el-card style="margin-top:15px" shadow="never" v-if="dataInfo.OrderType ==1 "> <el-card style="margin-top:15px" shadow="never">
<el-table border :data="dataInfo.HotelList" style="width: 100%"> <!-- 酒店 -->
<el-table-column prop="Id" label="商品标题"> <div v-if="dataInfo.OrderType ==1 ">
<template slot-scope="scope"> <el-table border :data="dataInfo.HotelList" style="width: 100%">
<div flex="dir:left cross:center"> <el-table-column prop="Id" label="酒店信息">
<img :src="getIconLink(scope.row.HotelImage)" alt="" <template slot-scope="scope">
style="height: 60px; width: 60px; margin-right: 5px;"> <div flex="dir:left cross:center" style="display:flex">
<div class="app-ellipsis"> <img
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 1;"> :src="getIconLink(scope.row.HotelImage)"
{{scope.row.HotelName}} alt
style="height: 60px; width: 60px; margin-right: 5px;"
/>
<div class="app-ellipsis">
<div
class="vue-line-clamp"
style="word-break: break-all; -webkit-line-clamp: 1;"
>{{scope.row.HotelName}}</div>
</div> </div>
</div> </div>
</div> </template>
</template> </el-table-column>
</el-table-column> <el-table-column prop="name" label="信息" align="center">
<el-table-column prop="name" label="信息" width="300" align="center"> <template slot-scope="scope">
<template slot-scope="scope"> <div>入店时间:{{scope.row.StartDate}}</div>
<div>车辆:{{scope.row.CarName}}{{scope.row.CarColorName}}{{scope.row.CarNumber}}</div> <div>离店时间:{{scope.row.EndDate}}</div>
<div>导游:{{scope.row.GuideName}}、服务类型:{{scope.row.CarTypeName}}{{scope.row.CarType==5? (scope.row.IsSpell==1?'拼车':'不拼车'):''}}</div> </template>
</el-table-column>
</template> <el-table-column prop="ArrivalTime" label="到店时间" align="center"></el-table-column>
</el-table-column> <el-table-column prop="ArrivalTime" label="价格表" align="center">
<el-table-column prop="Unit_Price" label="单价" width="120" align="center"> <template slot-scope="scope">
<template slot-scope="scope"> <div style="border:1px solid #e2e2e2">
{{scope.row.Unit_Price}} <div
</template> style="border-bottom:1px solid #e2e2e2"
</el-table-column> v-for="(x,y) in scope.row.PriceList"
<el-table-column prop="Number" label="数量" width="80" align="center"> :key="y"
</el-table-column> >{{x.Date}}:¥{{x.B2BPrice}}</div>
<el-table-column prop="Original_Price" label="原价" width="120" align="center"> </div>
<template slot-scope="scope"> </template>
{{scope.row.Original_Price}} </el-table-column>
</template> <el-table-column prop="Unit_Price" label="单价" align="center" width="150">
</el-table-column> <template slot-scope="scope">{{scope.row.Unit_Price}}</template>
<el-table-column prop="Final_Price" label="折扣后" width="120" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column prop="RoomNumber" label="数量" align="center" width="150"></el-table-column>
{{scope.row.Final_Price}}
</template> <el-table-column prop="Final_Price" label="结算价格" align="center" width="150">
</el-table-column> <template slot-scope="scope">{{scope.row.Final_Price}}</template>
<el-table-column prop="FreeShippingRemarks" label="备注" width="200" align="center"> </el-table-column>
</el-table>
</el-table-column> </div>
</el-table> <!-- 餐食 -->
<el-form label-width="200px" class="app-order-count-price"> <div v-if="dataInfo.OrderType ==2 ">
<el-form-item label="商品小计"> <el-table border :data="dataInfo.DiningList" style="width: 100%">
¥{{dataInfo.PreferPrice}} <el-table-column prop="Id" label="餐厅信息">
</el-form-item> <template slot-scope="scope">
<el-form-item label="实付款"> <div flex="dir:left cross:center" style="display:flex">
<span style="color: rgb(255, 69, 68);"><b>{{dataInfo.Income}}</b></span> <img
</el-form-item> :src="getIconLink(scope.row.DiningImg)"
</el-form> alt
</el-card> style="height: 60px; width: 60px; margin-right: 5px;"
/>
<div class="app-ellipsis">
<div
class="vue-line-clamp"
style="word-break: break-all; -webkit-line-clamp: 1;"
>{{scope.row.MealName}}</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="Date" label="就餐时间" align="center" width="150"></el-table-column>
<el-table-column prop="Unit_Price" label="单价" align="center" width="150">
<template slot-scope="scope">{{scope.row.Unit_Price}}</template>
</el-table-column>
<el-table-column prop="PeopleNumber" label="就餐人数" align="center" width="150"></el-table-column>
<el-table-column prop="Final_Price" label="结算价格" align="center" width="150">
<template slot-scope="scope">{{scope.row.Final_Price}}</template>
</el-table-column>
</el-table>
</div>
<!-- 门票 -->
<div v-if="dataInfo.OrderType ==3 ">
<el-table border :data="dataInfo.TicketList" style="width: 100%">
<el-table-column prop="Id" label="门票信息">
<template slot-scope="scope">
<div flex="dir:left cross:center" style="display:flex">
<img
:src="getIconLink(scope.row.TicketImg)"
alt
style="height: 60px; width: 60px; margin-right: 5px;"
/>
<div class="app-ellipsis">
<div
class="vue-line-clamp"
style="word-break: break-all; -webkit-line-clamp: 1;"
>{{scope.row.TicketName!=null ?scope.row.TicketName:''}}</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="ArrivalTime" label="入园人员信息" align="center">
<template slot-scope="scope">
<div style="border:1px solid #e2e2e2" v-if="scope.row.GuestList.length>0">
<div
style="border-bottom:1px solid #e2e2e2"
v-for="(x,y) in scope.row.GuestList"
:key="y"
>
<span>{{x.Name}}</span>
<span style="margin:0 10px">{{x.IdCard}}</span>
<span>{{x.Mobile}}</span>
</div>
</div>
<div>暂无</div>
</template>
</el-table-column>
<el-table-column prop="Date" label="入园时间" align="center" width="150"></el-table-column>
<el-table-column prop="Unit_Price" label="单价" align="center" width="150">
<template slot-scope="scope">{{scope.row.Unit_Price}}</template>
</el-table-column>
<el-table-column prop="PeopleNumber" label="数量" align="center" width="150"></el-table-column>
<el-table-column prop="Final_Price" label="结算价格" align="center" width="150">
<template slot-scope="scope">{{scope.row.Final_Price}}</template>
</el-table-column>
</el-table>
</div>
<!-- 专车 --> <!-- 专车 -->
<el-card style="margin-top:15px" shadow="never" v-if="dataInfo.OrderType ==4 "> <div v-if="dataInfo.OrderType ==4 ">
<el-table border :data="dataInfo.CarList" style="width: 100%"> <el-table border :data="dataInfo.CarList" style="width: 100%">
<el-table-column prop="Id" label="路线名称"> <el-table-column prop="Id" label="路线名称">
<template slot-scope="scope"> <template slot-scope="scope">{{scope.row.StartCityName}}-{{scope.row.ArriveCityName}}</template>
{{scope.row.StartCityName}}-{{scope.row.ArriveCityName}} </el-table-column>
</template> <el-table-column prop="Id" label="出发计划">
</el-table-column> <template slot-scope="scope">
<el-table-column prop="Id" label="出发计划">
<template slot-scope="scope">
<div>上车地点:{{scope.row.DepartAddress}}</div> <div>上车地点:{{scope.row.DepartAddress}}</div>
<div>下车地点:{{scope.row.ArriveAddress}}</div> <div>下车地点:{{scope.row.ArriveAddress}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="信息" width="300" align="center"> <el-table-column prop="name" label="信息" width="300" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>车辆:{{scope.row.BrandName}}{{scope.row.CarModel}}{{scope.row.CarColor}}</div> <div>车辆:{{scope.row.BrandName}}{{scope.row.CarModel}}{{scope.row.CarColor}}</div>
<div>车辆名称:{{scope.row.CarName}}</div> <div>车辆名称:{{scope.row.CarName}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Unit_Price" label="单价" width="120" align="center"> <el-table-column prop="Unit_Price" label="单价" width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">{{scope.row.Unit_Price}}</template>
{{scope.row.Unit_Price}} </el-table-column>
</template> <el-table-column prop="Number" label="数量" width="150" align="center">
</el-table-column>
<el-table-column prop="Number" label="数量" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.PeopleNumber>0">成人:{{scope.row.PeopleNumber}}</span> <div v-if="scope.row.PeopleNumber>0">成人:{{scope.row.PeopleNumber}}</div>
<span v-if="scope.row.ChildNumber>0">儿童:{{scope.row.ChildNumber}}</span> <div v-if="scope.row.ChildNumber>0">儿童:{{scope.row.ChildNumber}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Final_Price" label="结算价格" width="100" align="center"> <el-table-column prop="Final_Price" label="结算价格" width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">{{scope.row.Final_Price}}</template>
{{scope.row.Final_Price}} </el-table-column>
</template> </el-table>
</el-table-column> </div>
</el-table> <el-form label-width="200px" class="app-order-count-price" style="background:#FFF" width="120">
<el-form label-width="200px" class="app-order-count-price"> <el-form-item label="商品小计">¥{{dataInfo.PreferPrice}}</el-form-item>
<el-form-item label="商品小计">
¥{{dataInfo.PreferPrice}}
</el-form-item>
<el-form-item label="实付款"> <el-form-item label="实付款">
<span style="color: rgb(255, 69, 68);"><b>{{dataInfo.Income}}</b></span> <span style="color: rgb(255, 69, 68);">
<b>{{dataInfo.Income}}</b>
</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<div flex="dir:right" class="action-box"> <div flex="dir:right" class="action-box">
<el-button @click="qrEnd(dataInfo,2)" v-if="activeStep==2 && !exitState" style="margin-left: 10px;" size="small" <el-button
type="primary">确认</el-button> @click="qrEnd(dataInfo,2)"
v-if="activeStep==2 && !exitState"
style="margin-left: 10px;"
size="small"
type="primary"
>确认</el-button>
</div> </div>
</div> </div>
<!-- 订单取消 --> <!-- 订单取消 -->
<el-dialog title="修改" :visible.sync="exitDig" width="600px"> <el-dialog title="修改" :visible.sync="exitDig" width="600px">
<el-form :model="exitMsg" ref="exitMsg" label-width="0"> <el-form :model="exitMsg" ref="exitMsg" label-width="0">
...@@ -291,290 +385,306 @@ ...@@ -291,290 +385,306 @@
<el-button size="small" type="primary" @click="submitForm('exitMsg')">确 定</el-button> <el-button size="small" type="primary" @click="submitForm('exitMsg')">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
activeStep: 0, activeStep: 0,
tableData: [{ tableData: [
{
Id: 1 Id: 1
}], }
],
OrderId: 0,
dataInfo: {},
OrderInfo: {},
shDig: false,
exitMsg: {
OrderId: 0, OrderId: 0,
dataInfo: {}, Type: 1,
OrderInfo: {}, Remark: ""
shDig: false, },
exitMsg: { exitDig: false,
OrderId: 0,
Type: 1, fahuoList: [],
Remark: '', fhDig: false,
}, checkfhList: [],
exitDig: false, ExpressList: [],
exitState: false
fahuoList: [], };
fhDig: false, },
checkfhList: [], created() {
ExpressList: [], if (this.$route.query.OrderId) {
exitState: false, this.OrderId = this.$route.query.OrderId;
console.log(this.OrderId)
this.getData();
}
},
methods: {
// 确认完成
qrEnd(item, num) {
let msg = {
OrderId: item.OrderId,
Type: num,
Remark: ""
}; };
}, let that = this;
created() { let text;
if (this.$route.query.OrderId) { if (num == 2) {
this.OrderId = this.$route.query.OrderId; text = "是否确定订单?";
this.getData()
} }
}, that
methods: { .$confirm(text, "提示", {
confirmButtonText: "确定",
// 确认完成 cancelButtonText: "取消",
qrEnd(item, num) { type: "warning"
let msg = { })
OrderId: item.OrderId, .then(() => {
Type: num, this.lxymallapipost(
Remark:'', "/api/DmcOrder/SetDmcOrderOperation",
}; msg,
let that = this;
let text
if(num == 2){
text = '是否确定订单?'
}
that.$confirm(text, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.lxymallapipost('/api/DmcOrder/SetDmcOrderOperation', msg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getData(); this.getData();
this.Success(res.data.message) this.Success(res.data.message);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
null null
); );
}).catch(() => { })
.catch(() => {});
}); },
},
getData() {
this.lxymallapipost(
getData() { "/api/DmcOrder/GetDmcOrderInfo",
this.lxymallapipost("/api/DmcOrder/GetDmcOrderInfo", { {
OrderId: this.OrderId OrderId: this.OrderId
}, res => { },
res => {
this.dataInfo = res.data.data; this.dataInfo = res.data.data;
let data = res.data.data; let data = res.data.data;
// 未付款 // 未付款
if (data.PaymentTime == '') { if (data.PaymentTime == "") {
this.activeStep = 1; this.activeStep = 1;
} }
// 已付款 待确认 // 已付款 待确认
else if (data.PaymentTime != '' && data.ConfirmTime == '' && data.CancelTime == '') { else if (
data.PaymentTime != "" &&
data.ConfirmTime == "" &&
data.CancelTime == ""
) {
this.activeStep = 2; this.activeStep = 2;
} }
// 已付款 待确认 取消 // 已付款 待确认 取消
else if (data.PaymentTime != '' && data.ConfirmTime == '' && data.CancelTime != '') { else if (
data.PaymentTime != "" &&
data.ConfirmTime == "" &&
data.CancelTime != ""
) {
this.activeStep = 3; this.activeStep = 3;
} }
// 已付款 已确认 取消 // 已付款 已确认 取消
else if (data.PaymentTime != '' && data.ConfirmTime != '' && data.CancelTime != '') { else if (
data.PaymentTime != "" &&
data.ConfirmTime != "" &&
data.CancelTime != ""
) {
this.activeStep = 4; this.activeStep = 4;
} }
// 完成 // 完成
else if (data.PaymentTime != '' && data.ConfirmTime != '' && data.CancelTime == '') { else if (
data.PaymentTime != "" &&
data.ConfirmTime != "" &&
data.CancelTime == ""
) {
this.activeStep = 5; this.activeStep = 5;
} }
if (data.OrderStatus == 4) { if (data.OrderStatus == 4) {
this.exitState = true; this.exitState = true;
this.activeStep = 6; this.activeStep = 6;
} }
if (data.OrderInfo) { if (data.OrderInfo) {
this.OrderInfo = data.OrderInfo; this.OrderInfo = data.OrderInfo;
} }
})
},
// 修改备注
OrderExit() {
this.exitMsg = {
OrderId: this.dataInfo.OrderId,
Type: 1,
Remark: this.dataInfo.Remark,
} }
this.exitDig = true; );
},
// 订单操作
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.lxymallapipost('/api/order/SetOrderOperation', this.exitMsg,
res => {
if (res.data.resultCode === 1) {
this.getData();
this.Success(res.data.message)
this.exitDig = false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
}, },
mounted() {
// 修改备注
OrderExit() {
this.exitMsg = {
OrderId: this.dataInfo.OrderId,
Type: 1,
Remark: this.dataInfo.Remark
};
this.exitDig = true;
},
// 订单操作
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
this.lxymallapipost(
"/api/order/SetOrderOperation",
this.exitMsg,
res => {
if (res.data.resultCode === 1) {
this.getData();
this.Success(res.data.message);
this.exitDig = false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
} }
}; },
mounted() {}
};
</script> </script>
<style> <style>
@import '../Lxy/css/index.css'; @import "../Lxy/css/index.css";
.app-order-detail .goods-pic { .app-order-detail .goods-pic {
width: 35px; width: 35px;
height: 35px; height: 35px;
margin: 0 4px; margin: 0 4px;
} }
.app-order-detail .express-address { .app-order-detail .express-address {
width: 80%; width: 80%;
} }
.app-order-detail .action-box { .app-order-detail .action-box {
padding: 10px 20px; padding: 10px 20px;
} }
.app-order-detail .app-order-count-price .el-form-item { .app-order-detail .app-order-count-price .el-form-item {
margin-bottom: 5px; margin-bottom: 5px;
} }
.app-order-detail .app-order-count-price { .app-order-detail .app-order-count-price {
float: right; float: right;
margin-right: 55px; margin-right: 55px;
font-size: 12px; font-size: 12px;
text-align: right; text-align: right;
margin-top: 15px; margin-top: 15px;
} }
.app-order-detail h3 { .app-order-detail h3 {
padding: 15px 0; padding: 15px 0;
} }
.app-order-detail .share-price { .app-order-detail .share-price {
color: #EF8933; color: #ef8933;
} }
.app-order-detail .share-title { .app-order-detail .share-title {
font-size: 15px; font-size: 15px;
margin: 10px 0 5px; margin: 10px 0 5px;
} }
.app-order-detail .card-box .label { .app-order-detail .card-box .label {
color: #999999; color: #999999;
margin-right: 10px; margin-right: 10px;
} }
.app-order-detail .item-box { .app-order-detail .item-box {
margin-bottom: 10px; margin-bottom: 10px;
} }
.app-order-detail .card-box { .app-order-detail .card-box {
border: 1px solid #EBEEF5; border: 1px solid #ebeef5;
border-radius: 3px; border-radius: 3px;
padding: 10px; padding: 10px;
height: 300px; height: 300px;
overflow-y: scroll; overflow-y: scroll;
} }
.app-order-detail .stepExit { .app-order-detail .stepExit {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_6_active.png"); background-image: url("../../../assets/img/userman/status_6_active.png");
} }
.app-order-detail .step05 { .app-order-detail .step05 {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_5.png"); background-image: url("../../../assets/img/userman/status_5.png");
} }
.app-order-detail .step04 { .app-order-detail .step04 {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_4.png"); background-image: url("../../../assets/img/userman/status_4.png");
} }
.app-order-detail .step03 { .app-order-detail .step03 {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_3.png"); background-image: url("../../../assets/img/userman/status_3.png");
} }
.app-order-detail .step02 { .app-order-detail .step02 {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_2.png"); background-image: url("../../../assets/img/userman/status_2.png");
} }
.app-order-detail .step01 { .app-order-detail .step01 {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_2.png"); background-image: url("../../../assets/img/userman/status_2.png");
} }
.app-order-detail .step05Active { .app-order-detail .step05Active {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_5_active.png"); background-image: url("../../../assets/img/userman/status_5_active.png");
} }
.app-order-detail .step04Active { .app-order-detail .step04Active {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_4_active.png"); background-image: url("../../../assets/img/userman/status_4_active.png");
} }
.app-order-detail .step03Active { .app-order-detail .step03Active {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_3_active.png"); background-image: url("../../../assets/img/userman/status_3_active.png");
} }
.app-order-detail .step02Active { .app-order-detail .step02Active {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_2_active.png"); background-image: url("../../../assets/img/userman/status_2_active.png");
} }
.app-order-detail .step01Active { .app-order-detail .step01Active {
height: 30px; height: 30px;
width: 30px; width: 30px;
background-image: url("../../../assets/img/userman/status_1_active.png"); background-image: url("../../../assets/img/userman/status_1_active.png");
} }
.app-order-detail .app-order-status { .app-order-detail .app-order-status {
padding: 50px 120px; padding: 50px 120px;
margin-bottom: 30px; margin-bottom: 30px;
} }
.directorOrderDetails .content { .directorOrderDetails .content {
background: #fff; background: #fff;
margin-top: 10px; margin-top: 10px;
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
</style> </style>
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