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: '取消',

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

File diff suppressed because it is too large Load Diff

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()