zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单列表

Browse Source
This commit is contained in:
徐哼唧L
2023-12-13 11:10:01 +08:00
parent 2489d1a17b
commit 82c46b9980
3 changed files with 639 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/views/modules/order/buyorder.vue
View File

@@ -180,25 +180,25 @@
<div class="flexbox" style="justify-content: space-between;"> <div class="flexbox" style="justify-content: space-between;">
<div class="td1 flexbox" style="width:600px; align-items: flex-start; flex-wrap: wrap;"> <div class="td1 flexbox" style="width:600px; align-items: flex-start; flex-wrap: wrap;">
<div v-show="fitem.orderType == 'order'" class="flexbox orderProducts" <div v-show="fitem.orderType == 'order'" class="flexbox orderProducts"
:class="{ nobottomBorder: fitem.goodsList.length <= 3 }" :class="{ nobottomBorder: fitem.productList.length <= 3 }"
v-for="(children, index2) in fitem.goodsList" :key="children.id" style="width: 50%;"> v-for="(children, index2) in fitem.productList" :key="children.id" style="width: 50%;">
<el-tooltip class="item" v-if="children.expressInfo && children.expressInfo.expressOrderSn != null" <el-tooltip class="item" v-if="children.expressOrderId>0 && children.expressOrder != null"
effect="light" effect="light"
:content="`快递信息：${children.expressInfo.expressCompany} ${children.expressInfo.expressOrderSn}`" :content="`快递信息：${children.expressOrder.expressOrderSn}`"
placement="right"> placement="right">
<span class="normal hasDeliver"></span> <span class="normal hasDeliver"></span>
</el-tooltip> </el-tooltip>
<div class=" productItem k4545"> <div class=" productItem k4545">
<img <img
:class="children.expressInfo && children.expressInfo.expressOrderSn != null ? 'greeyImg' : 'lightImg'" :class="children.expressOrderId>0 && children.expressOrder != null ? 'greeyImg' : 'lightImg'"
:src="children.productImage" width="60px" height="60px"> :src="children.product.productImages" width="60px" height="60px">
</div> </div>
<div class="price " style="flex:1"> <div class="price " style="flex:1">
<div class="bookName">{{ children.productName }} &nbsp; <div class="bookName">{{ children.product.productName }} &nbsp;
<i v-if="children.books && children.books.length > 0" @click.stop="seeBooks(children.books)" <i v-if="children.product.books && children.product.books.length > 0" @click.stop="seeBooks(children.product.books)"
class="el-icon-view" style="color:#409eff; cursor: pointer;"></i> class="el-icon-view" style="color:#409eff; cursor: pointer;"></i>
</div> </div>
<div><span>￥{{ children.productPrice }}</span> × {{ children.quantity }} </div> <div><span>￥{{ children.product.price }}</span> × {{ children.quantity }} </div>
</div> </div>
</div> </div>
@@ -225,9 +225,9 @@
<!-- <img v-if="fitem.orderType == 'vip'" src="../../../../static/img/oder_vip.png" width="60px" height="60px"> --> <!-- <img v-if="fitem.orderType == 'vip'" src="../../../../static/img/oder_vip.png" width="60px" height="60px"> -->
</div> </div>
<div class="total td2 xcenter"> <div class="total td2 xcenter">
<div class="tabName">商品合计：<em>￥{{ fitem.orderPrice }}</em></div> <div class="tabName">商品合计：<em>￥{{ fitem.orderMoney }}</em></div>
<div class="tabName">运费：<em>￥{{ fitem.shippingPrice }}</em></div> <div class="tabName">运费：<em>￥{{ fitem.shippingMoney }}</em></div>
<div class="tabName">实收：<em>￥{{ fitem.realPrice }}</em></div> <div class="tabName">实收：<em>￥{{ fitem.realMoney }}</em></div>
<div class="tabContent"> <div class="tabContent">
<div></div> <div></div>
<!-- <div>含快递费：10.00，优惠券：{{ fitem.couponName }}，积分抵扣：-10.00</div> --> <!-- <div>含快递费：10.00，优惠券：{{ fitem.couponName }}，积分抵扣：-10.00</div> -->
@@ -241,10 +241,10 @@
<div class="buier td3 xcenter"> <div class="buier td3 xcenter">
<div class="tabName">收货信息： <div class="tabName">收货信息：
<div style="color: #515a6e;"><span <div style="color: #515a6e;"><span
style="color: #515a6e;">{{ fitem.consignee.consigneeName }}</span>&nbsp;&nbsp;&nbsp;<span style="color: #515a6e;">{{ fitem.shippingUser }}</span>&nbsp;&nbsp;&nbsp;<span
style="color: #515a6e;">{{ fitem.consignee.consigneeMobile }}</span></div> style="color: #515a6e;">{{ fitem.userPhone }}</span></div>
<div style="color: #515a6e;"> <div style="color: #515a6e;">
{{ fitem.consignee.province }}-{{ fitem.consignee.city }}-{{ fitem.consignee.county }}-{{ fitem.consignee.address }} {{ fitem.province }}-{{ fitem.city }}-{{ fitem.district }}-{{ fitem.address }}
</div> </div>
<div style="margin-bottom:10px"> <div style="margin-bottom:10px">
<el-button @click="changeAddressShow(fitem)" type="primary" size="mini" plain>修改收货信息</el-button> <el-button @click="changeAddressShow(fitem)" type="primary" size="mini" plain>修改收货信息</el-button>
@@ -310,16 +310,16 @@
<el-table-column prop="shippingUser" header-align="center" align="center" label="收货人信息"> <el-table-column prop="shippingUser" header-align="center" align="center" label="收货人信息">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.consignee.consigneeName && scope.row.consignee.consigneeName != ''">{{scope.row.consignee.consigneeName}}</span> v-if="scope.row.shippingUser && scope.row.shippingUser != ''">{{scope.row.shippingUser}}</span>
<span v-else>暂无</span> <span v-else>暂无</span>
-<span>{{scope.row.consignee.consigneeMobile}}</span><br /> -<span>{{scope.row.userPhone}}</span><br />
<span>{{scope.row.consignee.province}}</span> <span>{{scope.row.province}}</span>
<span <span
v-if="scope.row.consignee.city && scope.row.consignee.city != ''">-</span><span>{{scope.row.consignee.city}}</span> v-if="scope.row.city && scope.row.city != ''">-</span><span>{{scope.row.city}}</span>
<span <span
v-if="scope.row.consignee.county && scope.row.consignee.county != ''">-</span><span>{{scope.row.consignee.county}}</span> v-if="scope.row.district && scope.row.district != ''">-</span><span>{{scope.row.district}}</span>
<span <span
v-if="scope.row.consignee.address && scope.row.consignee.address != ''">-</span><span>{{scope.row.consignee.address}}</span> v-if="scope.row.address && scope.row.address != ''">-</span><span>{{scope.row.address}}</span>
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column <!--<el-table-column
@@ -365,11 +365,11 @@
<el-table-column prop="realMoney" header-align="center" align="center" label="实收金额"> <el-table-column prop="realMoney" header-align="center" align="center" label="实收金额">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="detailsFonts"> <div class="detailsFonts">
<span v-if="scope.row.shippingPrice">商品合计：￥{{scope.row.orderPrice}}</span> <span v-if="scope.row.shippingMoney">商品合计：￥{{scope.row.orderMoney}}</span>
<!-- <span v-if="scope.row.couponId">优惠券：-</span> --> <!-- <span v-if="scope.row.couponId">优惠券：-</span> -->
<span v-if="scope.row.shippingPrice">运费：￥{{scope.row.shippingPrice}}</span> <span v-if="scope.row.shippingMoney">运费：￥{{scope.row.shippingMoney}}</span>
<!-- <span >积分抵扣：-</span> --> <!-- <span >积分抵扣：-</span> -->
<span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.realPrice}}</b></span> <span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.realMoney}}</b></span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -381,18 +381,18 @@
</el-table-column> --> </el-table-column> -->
<el-table-column prop="createTime" header-align="center" align="center" label="下单时间"> <el-table-column prop="createTime" header-align="center" align="center" label="下单时间">
</el-table-column> </el-table-column>
<el-table-column prop="goodsList" header-align="center" align="center" label="下单商品" width="500"> <el-table-column prop="productList" header-align="center" align="center" label="下单商品" width="500">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{scope.row.goodsList}} --> <!-- {{scope.row.goodsList}} -->
<div v-for="(item, index) in scope.row.goodsList" :key="index"> <div v-for="(item, index) in scope.row.productList" :key="index">
<div class="flexbox" style="align-items:center; margin-bottom:10px"> <div class="flexbox" style="align-items:center; margin-bottom:10px">
<div class="img"> <div class="img">
<img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.productImage" <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.product.productImages"
width="40px" height="40px"> width="40px" height="40px">
</div> </div>
<div> <div>
<span>{{item.productName}} [ ￥{{item.productPrice}} × {{item.quantity}} ] <span>{{item.product.productName}} [ ￥{{item.product.price}} × {{item.quantity}} ]
<i v-if="item.books && item.books.length > 0" @click.stop="seeBooks(item.books)" class="el-icon-view" <i v-if="item.product.books && item.product.books.length > 0" @click.stop="seeBooks(item.product.books)" class="el-icon-view"
style="color:#409eff; cursor: pointer;"></i></span> style="color:#409eff; cursor: pointer;"></i></span>
</div> </div>
</div> </div>
@@ -418,7 +418,7 @@
:to="{ path: 'order-buyorderdetail', query: { orderSn: scope.row.orderSn, ordertype: scope.row.orderStatus} }"> :to="{ path: 'order-buyorderdetail', query: { orderSn: scope.row.orderSn, ordertype: scope.row.orderStatus} }">
<el-button type="text" size="small">订单详情</el-button> <el-button type="text" size="small">订单详情</el-button>
</router-link> </router-link>
<el-button type="text" size="small" @click="deleteOrder(scope.row)" v-if="tabChange.tabActiveName ==0" <el-button type="text" size="small" @click="deleteOrder(scope.row)" v-if="tabChange.tabActiveName == 0&&tabChange.tabActiveName != ''"
style="color: #f11f3b;">删除</el-button> style="color: #f11f3b;">删除</el-button>
<!-- <span v-if="scope.row.orderStatus"> <!-- <span v-if="scope.row.orderStatus">
<el-button type="text" size="small" @click="deliverDetail(scope.row)" <el-button type="text" size="small" @click="deliverDetail(scope.row)"
@@ -812,15 +812,15 @@
if (data.code == 0) { if (data.code == 0) {
this.addressForm.orderSn = val.orderSn this.addressForm.orderSn = val.orderSn
this.provinceEntity = data.provinceEntity this.provinceEntity = data.provinceEntity
this.addressForm.addressXX = val.consignee.address this.addressForm.addressXX = val.address
this.addressForm.provinceCode = val.consignee.provinceCode this.addressForm.provinceCode = val.consigneeVo.provinceCode
this.addressForm.cityCode = val.consignee.cityCode this.addressForm.cityCode = val.consigneeVo.cityCode
this.addressForm.countyCode = val.consignee.countyCode this.addressForm.countyCode = val.consigneeVo.countyCode
this.addressForm.provinceName = val.consignee.provinceCode this.addressForm.provinceName = val.province
this.addressForm.cityName = val.consignee.city this.addressForm.cityName = val.city
this.addressForm.countyName = val.consignee.county this.addressForm.countyName = val.district
this.addressForm.name = val.consignee.consigneeName this.addressForm.name = val.shippingUser
this.addressForm.tel = val.consignee.consigneeMobile this.addressForm.tel = val.userPhone
this.cityEntity = this.provinceEntity.find((val, index, arr) => { this.cityEntity = this.provinceEntity.find((val, index, arr) => {
return val.regionCode == this.addressForm.provinceCode return val.regionCode == this.addressForm.provinceCode
}) })
@@ -957,8 +957,8 @@
}) => { }) => {
// console.log(data,'列表数据') // console.log(data,'列表数据')
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.result.data this.dataList = data.result.records
this.totalPage = data.result.totalDataSize this.totalPage = data.result.total
if (this.tabChange.tabActiveName === '1') { // 判断可选按钮是否可用 if (this.tabChange.tabActiveName === '1') { // 判断可选按钮是否可用
this.isMultipleDisabled() this.isMultipleDisabled()
} }
@@ -1044,7 +1044,6 @@
}, },
// 删除订单 // 删除订单
deleteOrder(row) { deleteOrder(row) {
console.log(row)
this.$confirm(`确定对订单编号${row.orderSn}进行删除操作?`, '提示', { this.$confirm(`确定对订单编号${row.orderSn}进行删除操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',

287
src/views/modules/order/buyorderdetail.vue
View File

@@ -11,7 +11,9 @@
<ul class="list"> <ul class="list">
<div v-if="orderDetails.userInfo"> <div v-if="orderDetails.userInfo">
<div class="liName">用户信息</div> <div class="liName">用户信息</div>
<li><span class="infoTitle">用户名：</span><span>{{orderDetails.userInfo.userName !== null ? orderDetails.userInfo.userName : '暂无'}}</span></li> <li><span
class="infoTitle">用户名：</span><span>{{orderDetails.userInfo.userName !== null ? orderDetails.userInfo.userName : '暂无'}}</span>
</li>
<!-- <li><span class="infoTitle">用户ID：</span><span>{{orderDetails.userId}}</span></li> --> <!-- <li><span class="infoTitle">用户ID：</span><span>{{orderDetails.userId}}</span></li> -->
<li><span class="infoTitle">联系电话：</span><span>{{orderDetails.userInfo.userPhone}}</span></li> <li><span class="infoTitle">联系电话：</span><span>{{orderDetails.userInfo.userPhone}}</span></li>
<li style="clear:both"></li> <li style="clear:both"></li>
@@ -32,23 +34,26 @@
<li><span class="infoTitle">订单金额：</span><span>￥{{orderDetails.orderPrice}}</span></li> <li><span class="infoTitle">订单金额：</span><span>￥{{orderDetails.orderPrice}}</span></li>
<li><span class="infoTitle">交付邮费：</span><span>￥{{orderDetails.shippingPrice}}</span></li> <li><span class="infoTitle">交付邮费：</span><span>￥{{orderDetails.shippingPrice}}</span></li>
<li v-if="orderDetails.orderStatus > 0"><span class="infoTitle" >实际支付金额：</span><span>￥{{orderDetails.realPrice}}</span></li> <li v-if="orderDetails.orderStatus > 0"><span
class="infoTitle">实际支付金额：</span><span>￥{{orderDetails.realPrice}}</span></li>
<li><span class="infoTitle">创建时间：</span><span>{{orderDetails.createTime}}</span></li> <li><span class="infoTitle">创建时间：</span><span>{{orderDetails.createTime}}</span></li>
<li><span class="infoTitle" v-if="orderDetails.orderStatus > 0">支付时间：</span><span>{{orderDetails.paymentDate}}</span></li> <li v-if="orderDetails.orderStatus > 0"><span
class="infoTitle">支付时间：</span><span>{{orderDetails.paymentDate}}</span></li>
<li style="width: 100%;" v-if="orderDetails.orderStatus > 0"><span class="infoTitle">支付方式：</span> <li style="width: 100%;" v-if="orderDetails.orderStatus > 0"><span class="infoTitle">支付方式：</span>
<span v-if="orderDetails.paymentMethod == 2"><icon-svg name="zhifubao"></icon-svg> <span>支付宝支付</span></span> <span v-if="orderDetails.paymentMethod == 2"><icon-svg name="zhifubao"></icon-svg> <span>支付宝支付</span></span>
<span v-if="orderDetails.paymentMethod == 1"><icon-svg name="weixin"></icon-svg> <span>微信支付</span></span> <span v-if="orderDetails.paymentMethod == 1"><icon-svg name="weixin"></icon-svg> <span>微信支付</span></span>
<span v-if="orderDetails.paymentMethod == 4"><img src="../../../../static/img/oder_chong.png" width="22px" height="22px"> <span>天医币支付</span></span> <span v-if="orderDetails.paymentMethod == 4"><img src="../../../../static/img/oder_chong.png" width="22px"
height="22px"> <span>天医币支付</span></span>
<span v-if="orderDetails.paymentMethod == 3"> <span v-if="orderDetails.paymentMethod == 3">
<!-- <icon-svg name="zhifubao"></icon-svg> --> <!-- <icon-svg name="zhifubao"></icon-svg> -->
<span>IOS内购</span> <span>IOS内购</span>
</span> </span>
</li> </li>
<li style="width: 100%;" v-if="orderDetails.paymentMethod == 2"> <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2&&orderDetails.orderStatus > 0">
<span class="infoTitle">商家订单号：</span> <span class="infoTitle">商家订单号：</span>
<span>{{orderDetails.outTradeNo}}</span> <span>{{orderDetails.outTradeNo}}</span>
</li> </li>
<li style="width: 100%;" v-if="orderDetails.paymentMethod == 2"> <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2&&orderDetails.orderStatus > 0">
<span class="infoTitle">支付宝订单号：</span> <span class="infoTitle">支付宝订单号：</span>
<span>{{orderDetails.tradeNo}}</span> <span>{{orderDetails.tradeNo}}</span>
</li> </li>
@@ -64,65 +69,73 @@
<div style="clear:both"></div> <div style="clear:both"></div>
<!-- 订单商品 --> <!-- 订单商品 -->
<div class="liName">商品信息</div> <div class="liName">商品信息</div>
<el-table :data="orderDetails.goodsList" <el-table :data="orderDetails.goodsList" style="width: 100%">
style="width: 100%"> <el-table-column label="商品名" width="280">
<el-table-column
label="商品名"
width="280">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="flexbox"> <div class="flexbox">
<img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="scope.row.productImage" width="30px" height="30px"> <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="scope.row.productImage"
width="30px" height="30px">
<div class="proname">{{ scope.row.productName}} <div class="proname">{{ scope.row.productName}}
<i v-if="scope.row.books && scope.row.books.length > 0" @click.stop="seeBooks(scope.row.books)" class="el-icon-view" style="color:#409eff; cursor: pointer;"></i></div> <i v-if="scope.row.books && scope.row.books.length > 0" @click.stop="seeBooks(scope.row.books)"
class="el-icon-view" style="color:#409eff; cursor: pointer;"></i>
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="productPrice" label="价格" width="180">
prop="productPrice"
label="价格"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="quantity" label="数量" width="80">
prop="quantity"
label="数量" width="80">
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-if="orderDetails.consignee" style="margin-top:20px"> <div v-if="orderDetails.consignee" style="margin-top:20px">
<div class="liName">物流信息 <a href="#" @click="changeAddressShow" v-if="orderDetails.orderStatus <= 1"><i class="el-icon-edit"></i>修改收货信息</a></div> <div class="liName">物流信息 <a href="#" @click="changeAddressShow" v-if="orderDetails.orderStatus <= 1"><i
class="el-icon-edit"></i>修改收货信息</a></div>
<div style="background:#f9f9f9; padding:5px; overflow:hidden; "> <div style="background:#f9f9f9; padding:5px; overflow:hidden; ">
<li><span class="infoTitle">收货人：</span><span>{{orderDetails.consignee.consigneeName}}</span>&nbsp;&nbsp;&nbsp;<span>{{orderDetails.consignee.consigneeMobile}}</span></li> <li><span
<li><span class="infoTitle">收货地址：</span><span>{{orderDetails.consignee.province}}-{{orderDetails.consignee.city}}-{{orderDetails.consignee.county}}-{{orderDetails.consignee.address}}</span></li> class="infoTitle">收货人：</span><span>{{orderDetails.consignee.consigneeName}}</span>&nbsp;&nbsp;&nbsp;<span>{{orderDetails.consignee.consigneeMobile}}</span>
</li>
<li><span
class="infoTitle">收货地址：</span><span>{{orderDetails.consignee.province}}-{{orderDetails.consignee.city}}-{{orderDetails.consignee.county}}-{{orderDetails.consignee.address}}</span>
</li>
</div> </div>
</div> </div>
<!-- <el-alert title="`该订单下共有 2 条物流信息`" type="info"> <!-- <el-alert title="`该订单下共有 2 条物流信息`" type="info">
</el-alert> --> </el-alert> -->
<li class="flexbox deliverBox" style="width: 100%;" v-if="orderDetails.orderStatus > 0 && sheetList && sheetList.length > 0"> <li class="flexbox deliverBox" style="width: 100%;"
v-if="orderDetails.orderStatus > 0 && sheetList && sheetList.length > 0">
<el-row :gutter="20" style="flex-wrap:wrap; width: 100%;" class="flexbox"> <el-row :gutter="20" style="flex-wrap:wrap; width: 100%;" class="flexbox">
<el-col :md="12" :lg="12" class="item" v-for="(item, index) in sheetList" :key="index"> <el-col :md="12" :lg="12" class="item" v-for="(item, index) in sheetList" :key="index">
<div class="deliver_heade"> <div class="deliver_heade">
<!-- <div><span class="infoTitle">物流公司：</span><span>{{item.expressCompanyName}}</span></div> --> <!-- <div><span class="infoTitle">物流公司：</span><span>{{item.expressCompanyName}}</span></div> -->
<div> <div>
<span class="infoTitle">快递包裹 {{index+1}} 运单号：</span><span style="margin-right:10px">{{item.expressOrderSn}}</span> <span class="infoTitle">快递包裹 {{index+1}} 运单号：</span><span
<span v-if="item.showProduct" style="color:#409eff; cursor: pointer;" @click.stop="showProducts(item, index)"> style="margin-right:10px">{{item.expressOrderSn}}</span>
<span v-if="item.showProduct" style="color:#409eff; cursor: pointer;"
@click.stop="showProducts(item, index)">
<i class="el-icon-arrow-up myicon"></i>隐藏包裹内商品</span> <i class="el-icon-arrow-up myicon"></i>隐藏包裹内商品</span>
<span v-else style="color:#409eff; cursor: pointer;" @click.stop="showProducts(item,index)"> <span v-else style="color:#409eff; cursor: pointer;" @click.stop="showProducts(item,index)">
<i class="el-icon-arrow-down myicon"></i>显示包裹内商品</span> <i class="el-icon-arrow-down myicon"></i>显示包裹内商品</span>
<el-button type="primary" size="mini" plain @click="seeSheetDetails(item)" style="margin-left:10px">查看物流进度</el-button> <el-button type="primary" size="mini" plain @click="seeSheetDetails(item)"
style="margin-left:10px">查看物流进度</el-button>
<!-- 包含的订单商品信息 --> <!-- 包含的订单商品信息 -->
<div class="" v-if="showChange && item.showProduct" style="margin-top:15px; overflow:hidden; background:#f9f9f9; padding:10px;"> <div class="" v-if="showChange && item.showProduct"
style="margin-top:15px; overflow:hidden; background:#f9f9f9; padding:10px;">
<ul class="sheetOrdersUl" style="overflow:hidden"> <ul class="sheetOrdersUl" style="overflow:hidden">
<li style="flex-wrap:wrap; margin-bottom:10px; width: 100%;"> <li style="flex-wrap:wrap; margin-bottom:10px; width: 100%;">
<!-- <div style="width:100%" v-if="showChange">订单编号：{{item.orderSn}}</div> --> <!-- <div style="width:100%" v-if="showChange">订单编号：{{item.orderSn}}</div> -->
<div> <div>
<div class="flexbox" v-for="item2 in item.products" :key="item2.productId" style="align-items:center; margin-bottom:10px"> <div class="flexbox" v-for="item2 in item.products" :key="item2.productId"
style="align-items:center; margin-bottom:10px">
<div class="img"> <div class="img">
<img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item2.productImages" width="60px" height="60px"> <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;"
:src="item2.productImages" width="60px" height="60px">
</div> </div>
<div> <div>
<div><span>{{item2.productName}} [ ×{{item2.quantity}} ]</span> </div> <div><span>{{item2.productName}} [ ×{{item2.quantity}} ]</span> </div>
<div style="color:#999">所属订单：{{item2.orderSn}}</div> <div style="color:#999">所属订单：{{item2.orderSn}}</div>
</div> </div>
</div></div> </div>
</div>
</li> </li>
</ul> </ul>
</div> </div>
@@ -133,13 +146,14 @@
</el-row> </el-row>
</li> </li>
<li class="line" style="margin:10px 0;"></li> <li class="line" style="margin:10px 0;"></li>
<li style="text-align: right;width: 100%;" v-if="orderDetails.orderStatus==0||orderDetails.orderStatus==1">
<el-button type="danger" style="" size="mini" plain @click="deleteOrder()">删除订单</el-button>
</li>
</ul> </ul>
</div> </div>
<!-- 抽屉 --> <!-- 抽屉 -->
<el-dialog <el-dialog title="物流详情" :visible.sync="tracesShow" @close="drawerHandleClose">
title="物流详情"
:visible.sync="tracesShow"
@close="drawerHandleClose">
<div class="deliver_info"> <div class="deliver_info">
<div>运单信息：{{currentSheet.expressCompanyName}} - {{currentSheet.expressOrderSn}}</div> <div>运单信息：{{currentSheet.expressCompanyName}} - {{currentSheet.expressOrderSn}}</div>
<div class="scroll" style="padding: 10px;" v-if="traces && traces.length > 0"> <div class="scroll" style="padding: 10px;" v-if="traces && traces.length > 0">
@@ -153,11 +167,7 @@
<div v-else class="noinfo">-暂无物流信息-</div> <div v-else class="noinfo">-暂无物流信息-</div>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog title="修改收货信息" :visible.sync="changeAddVisible" width="500" :close="changeAddHandleClose">
title="修改收货信息"
:visible.sync="changeAddVisible"
width="500"
:close="changeAddHandleClose">
<div> <div>
<el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule"> <el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule">
<el-form-item label="收货人:" prop="name"> <el-form-item label="收货人:" prop="name">
@@ -170,27 +180,19 @@
<!-- <el-input v-model="addressForm.address"></el-input> --> <!-- <el-input v-model="addressForm.address"></el-input> -->
<!-- 省市区--> <!-- 省市区-->
<!-- 省 --> <!-- 省 -->
<el-select v-model="addressForm.provinceCode" placeholder="请选择省份" style="width:200px" @change="provinceChange"> <el-select v-model="addressForm.provinceCode" placeholder="请选择省份" style="width:200px"
<el-option @change="provinceChange">
v-for="item in provinceEntity" <el-option v-for="item in provinceEntity" :key="item.regionCode" :label="item.provName"
:key="item.regionCode"
:label="item.provName"
:value="item.regionCode"> :value="item.regionCode">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="addressForm.cityCode" placeholder="请选择市" @change="cityChange"> <el-select v-model="addressForm.cityCode" placeholder="请选择市" @change="cityChange">
<el-option <el-option v-for="item in cityEntity.cityList" :key="item.regionCode" :label="item.cityName"
v-for="item in cityEntity.cityList"
:key="item.regionCode"
:label="item.cityName"
:value="item.regionCode"> :value="item.regionCode">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="addressForm.countyCode" placeholder="请选择区" @change="countyChange"> <el-select v-model="addressForm.countyCode" placeholder="请选择区" @change="countyChange">
<el-option <el-option v-for="item in countyEntity.countyList" :key="item.regionCode" :label="item.countyName"
v-for="item in countyEntity.countyList"
:key="item.regionCode"
:label="item.countyName"
:value="item.regionCode"> :value="item.regionCode">
</el-option> </el-option>
</el-select> </el-select>
@@ -205,17 +207,14 @@
<el-button type="primary" @click="changeAddress">确 定</el-button> <el-button type="primary" @click="changeAddress">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog center <el-dialog center title="商品包含的书籍信息" :visible.sync="booksShow" width="500" :close="booksHandleClose">
title="商品包含的书籍信息"
:visible.sync="booksShow"
width="500"
:close="booksHandleClose">
<div> <div>
<span>该商品共包含了 {{currBookLIst.length}} 个书籍</span> <span>该商品共包含了 {{currBookLIst.length}} 个书籍</span>
<ul class="booksUl "> <ul class="booksUl ">
<li class="flexbox" v-for="item in currBookLIst" :key="item.id"> <li class="flexbox" v-for="item in currBookLIst" :key="item.id">
<div class="img"> <div class="img">
<img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.images" width="100px" height="100px"> <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.images" width="100px"
height="100px">
</div> </div>
<div> <div>
<span>{{item.name}}[{{item.id}}]</span> <span>{{item.name}}[{{item.id}}]</span>
@@ -282,18 +281,26 @@ export default {
children: "children" children: "children"
}, },
addressFormRule: { addressFormRule: {
name: [ name: [{
{ required: true, message: '请输入收货人信息', trigger: 'blur' } required: true,
], message: '请输入收货人信息',
tel: [ trigger: 'blur'
{ required: true, message: '请输入收货联系电话信息', trigger: 'blur' } }],
], tel: [{
county: [ required: true,
{ required: true, message: '请选择收货地址', trigger: 'blur' } message: '请输入收货联系电话信息',
], trigger: 'blur'
addressXX: [ }],
{ required: true, message: '请输入详细地址信息', trigger: 'blur' } county: [{
], required: true,
message: '请选择收货地址',
trigger: 'blur'
}],
addressXX: [{
required: true,
message: '请输入详细地址信息',
trigger: 'blur'
}],
}, },
sheetList: [], // 面单列表 sheetList: [], // 面单列表
currBookLIst: [], currBookLIst: [],
@@ -351,7 +358,9 @@ export default {
// 'expressCompanyCode': item.expressCompanyCode, // 'expressCompanyCode': item.expressCompanyCode,
// 'customerName': this.orderDetails.consignee.consigneeMobile.substring(mobileLeng-4, mobileLeng) // 'customerName': this.orderDetails.consignee.consigneeMobile.substring(mobileLeng-4, mobileLeng)
}) })
}).then(({ data }) => { }).then(({
data
}) => {
if (data.code == 0) { if (data.code == 0) {
if (data.express.traces.length > 0) { if (data.express.traces.length > 0) {
this.traces = data.express.traces this.traces = data.express.traces
@@ -364,7 +373,9 @@ export default {
} }
} }
}).catch(({e}) => { }).catch(({
e
}) => {
console.log(e, 'e') console.log(e, 'e')
loading.close() loading.close()
}) })
@@ -424,7 +435,9 @@ export default {
// params: this.$http.adornParams({ // params: this.$http.adornParams({
// 'orderId': this.query.orderId // 'orderId': this.query.orderId
// }) // })
}).then(({ data }) => { }).then(({
data
}) => {
// console.log('获取地址三级列表', data) // console.log('获取地址三级列表', data)
if (data.code == 0) { if (data.code == 0) {
this.provinceEntity = data.provinceEntity this.provinceEntity = data.provinceEntity
@@ -473,7 +486,9 @@ export default {
//'orderId': this.addressForm.orderId //'orderId': this.addressForm.orderId
}) })
}).then(({ data }) => { }).then(({
data
}) => {
// console.log('修改地址返回值', data) // console.log('修改地址返回值', data)
this.$message.success('修改地址成功！') this.$message.success('修改地址成功！')
this.changeAddHandleClose() this.changeAddHandleClose()
@@ -498,14 +513,20 @@ export default {
params: this.$http.adornParams({ params: this.$http.adornParams({
'orderSn': this.query.orderSn, 'orderSn': this.query.orderSn,
}) })
}).then(({ data }) => { }).then(({
data
}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
// console.log(data.result,'data.result') // console.log(data.result,'data.result')
this.orderDetails = data.result this.orderDetails = data.result
if (data.result.expressOrders) {
data.result.expressOrders.forEach(element => { data.result.expressOrders.forEach(element => {
element.showProduct = false element.showProduct = false
}); });
this.sheetList = data.result.expressOrders this.sheetList = data.result.expressOrders
}
} else { } else {
this.orderDetails = {} this.orderDetails = {}
return this.$message.error('商品详情获取失败，请重试') return this.$message.error('商品详情获取失败，请重试')
@@ -521,6 +542,40 @@ export default {
godeliver() { godeliver() {
this.orderList[0] = this.query.orderSn this.orderList[0] = this.query.orderSn
this.setDeliverVisible = true this.setDeliverVisible = true
},
// 删除订单
deleteOrder() {
this.$confirm(`确定对订单进行删除操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('/book/buyOrder/orderDel'),
method: 'post',
params: this.$http.adornParams({
'orderSn': this.orderDetails.orderSn
})
}).then(({
data
}) => {
if (data && data.code === 0) {
this.$message({
message: '删除成功',
type: 'success',
duration: 1500,
onClose: () => {
this.$router.push({
path: "/order-buyorder",
});
}
})
} else {
this.$message.error(data.msg)
}
})
})
} }
}, },
components: { components: {
@@ -530,55 +585,100 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.myicon{border: 1px solid #409eff; margin-right: 5px;} .myicon {
.booksUl{ overflow: hidden; margin-top: 15px; padding-left: 0; border: 1px solid #409eff;
li{list-style: none; width: 50%; float: left; align-items: center; margin-bottom: 15px;} margin-right: 5px;
} }
.sheetOrdersUl{padding-left: 0;
li{width: 100%;} .booksUl {
overflow: hidden;
margin-top: 15px;
padding-left: 0;
li {
list-style: none;
width: 50%;
float: left;
align-items: center;
margin-bottom: 15px;
} }
}
.sheetOrdersUl {
padding-left: 0;
li {
width: 100%;
}
}
.orderType { .orderType {
overflow: hidden; margin-bottom: 20px; overflow: hidden;
margin-bottom: 20px;
.item { .item {
color: #fff; color: #fff;
display: inline-block; display: inline-block;
padding: 10px; padding: 10px;
border-radius: 0 20px 20px 0; border-radius: 0 20px 20px 0;
} }
.hightLight0 { .hightLight0 {
background-color: #e6a23c; background-color: #e6a23c;
} }
.hightLight1 { .hightLight1 {
background-color: #409eff; background-color: #409eff;
} }
.hightLight2 { .hightLight2 {
background-color: #f56c6c; background-color: #f56c6c;
} }
.hightLight3 { .hightLight3 {
background-color: #67c23a; background-color: #67c23a;
} }
} }
.noinfo { .noinfo {
color: #ddd; color: #ddd;
text-align: center; text-align: center;
padding: 20px; padding: 20px;
} }
.scroll{margin-top: 15px; height: 300px;}
.scroll {
margin-top: 15px;
height: 300px;
}
.deliverBox { .deliverBox {
flex-wrap: wrap; justify-content: space-between; flex-wrap: wrap;
.item{padding-right: 15px; min-width: 300px; justify-content: space-between;
.deliver_heade{margin-top: 15px;}
.item {
padding-right: 15px;
min-width: 300px;
.deliver_heade {
margin-top: 15px;
} }
} }
}
.el-timeline { .el-timeline {
li { li {
float: none; float: none;
} }
} }
.flexbox { .flexbox {
display: flex; display: flex;
} }
.deliver_info{border-radius: 10px;}
.deliver_info {
border-radius: 10px;
}
.infoTitle { .infoTitle {
display: inline; display: inline;
} }
@@ -616,6 +716,7 @@ ul.list {
.text_button { .text_button {
padding: 0; padding: 0;
} }
.el-icon-truck:before { .el-icon-truck:before {
content: "\e740"; content: "\e740";
} }
@@ -624,6 +725,7 @@ ul.list {
.el-timeline-item__node { .el-timeline-item__node {
background-color: rgb(11, 189, 135); background-color: rgb(11, 189, 135);
} }
color: rgb(11, 189, 135) !important; color: rgb(11, 189, 135) !important;
} }
@@ -680,11 +782,16 @@ ul.list {
font-size: 14px; font-size: 14px;
; ;
} }
/deep/ .el-select-dropdown{width: 200px !important;}
/deep/ .el-select-dropdown {
width: 200px !important;
}
:deep(.el-select-dropdown__list) { :deep(.el-select-dropdown__list) {
width: 200px !important; width: 200px !important;
} }
/deep/ .el-select-dropdown__list{width: 200px !important;}
/deep/ .el-select-dropdown__list {
width: 200px !important;
}
</style> </style>

12
src/views/modules/order/orderdeliver-split.vue
View File

@@ -27,13 +27,13 @@
<div class="item_body"> <div class="item_body">
<div class="flexbox" style="justify-content: space-between;"> <div class="flexbox" style="justify-content: space-between;">
<div class="td1 flexbox" style="align-items: flex-start;"> <div class="td1 flexbox" style="align-items: flex-start;">
<div class="flexbox orderProducts" v-for="products in productsCodeList" :key="products.productId"> <div class="flexbox orderProducts" v-for="products in productsCodeList" :key="products.product.productId">
<div class="flexbox productItem" style=""> <div class="flexbox productItem" style="">
<!-- <el-checkbox :label="products.allOrderId"></el-checkbox> --> <!-- <el-checkbox :label="products.allOrderId"></el-checkbox> -->
<img :src="products.productImage" width="30px" height="30px" :class="products.expressInfo && products.expressInfo.expressOrderSn != null ? 'gray' : ''" > <img :src="products.product.productImages" width="30px" height="30px" :class="products.expressOrderId>0 && products.expressOrder != null ? 'gray' : ''" >
<div class="" style="align-items: center;"> <div class="" style="align-items: center;">
<div class="bookName" style="margin-left:0">{{ products.productName }}</div> <div class="bookName" style="margin-left:0">{{ products.product.productName }}</div>
<div style="width:100%; color:#17B3A3; font-size:12px" v-if="products.expressInfo && products.expressInfo.expressOrderSn != null">快递信息：{{products.expressInfo.expressCompany}}-{{products.expressInfo.expressOrderSn}}</div> <div style="width:100%; color:#17B3A3; font-size:12px" v-if="products.expressOrderId>0 && products.expressOrder != null">快递信息：{{products.expressOrder.expressOrderSn}}</div>
</div> </div>
</div> </div>
<div class="flexbox"> <div class="flexbox">
@@ -232,7 +232,7 @@ export default {
this.productsCodeList.splice(index, 1) this.productsCodeList.splice(index, 1)
// console.log(index) // console.log(index)
} }
this.productsIdsList = this.productsCodeList.map( item => item.buyOrderProductId) this.productsIdsList = this.productsCodeList.map( item => item.id)
}) })
}, },
// //
@@ -371,7 +371,7 @@ export default {
orderitem: { orderitem: {
handler(val, oldVal) { handler(val, oldVal) {
// console.log('变化',val) // console.log('变化',val)
this.productsCodeList = val.goodsList this.productsCodeList = val.productList
this.getNewProducts() this.getNewProducts()
// console.log('productsIdsList',this.productsIdsList) // console.log('productsIdsList',this.productsIdsList)
this.getMixDeliverOrderList() this.getMixDeliverOrderList()