Skip to content

P
pica.cloud.web-education-admin
提交 009f79d0 编写于 作者: shuang.zhou's avatar shuang.zhou
浏览文件
操作

Merge branch 'develop-3.18.0' into 'release' 

Develop 3.18.0

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!330
上级 4bb18afb 12f70282
显示空白字符变更
内嵌 并排
正在显示 包含 15370 行增加 和 3415 行删除
package-lock.json
浏览文件 @ 009f79d0
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
src/utils/shop/index.js
浏览文件 @ 009f79d0
...@@ -128,3 +128,12 @@ export const brokerOwnerListAll = (params) => { ...@@ -128,3 +128,12 @@ export const brokerOwnerListAll = (params) => {
description: '云鹊店铺-订单管理-招募人列表', description: '云鹊店铺-订单管理-招募人列表',
}) })
}; };
// 获取退款说明
export const getRefundDesc = (aid) => {
return fetch({
headers,
url: getBaseUrl(`/store/orders/admin/queryRefundDesc/${aid}`),
method: 'get',
description: '退款说明',
})
};
src/views/goods/order-detail.vue
浏览文件 @ 009f79d0
...@@ -2,22 +2,165 @@ ...@@ -2,22 +2,165 @@
<div class="order-detail-wrapper"> <div class="order-detail-wrapper">
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird"></bread-crumb> <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird"></bread-crumb>
<div class="order-detail-content screenSet" id="screenSet"> <div class="order-detail-content screenSet" id="screenSet">
<div class="header-title">订单详情</div> <el-row :gutter="20" class="order-detail-header">
<el-col :span="20"><div class="header-title">订单详情</div></el-col>
<el-col :span="4" >
<div class="trade-status"><img :src="statusImgUrl"/> {{showStatusStr}}</div>
</el-col>
</el-row>
<!-- <div class="header-title">订单详情</div> -->
<div class="detail-all-info"> <div class="detail-all-info">
<div class="trade-status" v-if="showStatus == 1"><img src="../../assets/image/order/order_status1.png"/>交易成功</div> <!-- <div class="trade-status" v-if="showStatus == 1"><img src="../../assets/image/order/order_status1.png"/>交易成功</div>
<div class="trade-status" v-if="showStatus == 2"><img src="../../assets/image/order/order_status2.png"/>已发货</div> <div class="trade-status" v-if="showStatus == 2"><img src="../../assets/image/order/order_status2.png"/>已发货</div>
<div class="trade-status" v-if="showStatus == 3"><img src="../../assets/image/order/order_status3.png"/>待发货</div> <div class="trade-status" v-if="showStatus == 3"><img src="../../assets/image/order/order_status3.png"/>待发货</div>
<div class="trade-status" v-if="showStatus == 4"><img src="../../assets/image/order/order_status4.png"/>等待买家付款</div> <div class="trade-status" v-if="showStatus == 4"><img src="../../assets/image/order/order_status4.png"/>等待买家付款</div>
<div class="trade-status" v-if="showStatus == 5"><img src="../../assets/image/order/order_status5.png"/>退款/关闭</div> <div class="trade-status" v-if="showStatus == 5"><img src="../../assets/image/order/order_status5.png"/>退款/关闭</div> -->
<!-- 表格 -->
<el-table :data="tableData" border class="item-table" style="width: 100%;margin-top: 30px;">
<el-table-column prop="goodsName" label="商品名称" min-width="100" align="center">
<template slot-scope="scope">
<div style="cursor: pointer;color: #449284" @click="goGoodsEdit(scope.row)">{{ scope.row.goodsName }}</div>
</template>
</el-table-column>
<el-table-column prop="size" label="规格" min-width="100" align="center"></el-table-column>
<el-table-column prop="goodsQuantity" label="数量" min-width="100" align="center">
<template slot-scope="scope">
<span>×{{ scope.row.goodsQuantity }}</span>
</template>
</el-table-column>
<el-table-column prop="price" label="单价" min-width="100" align="center">
<template slot-scope="scope">
<span>￥{{ scope.row.price | toFixed2 }}</span>
</template>
</el-table-column>
<el-table-column prop="totalPrice" label="商品总额" min-width="100" align="center">
<template slot-scope="scope">
<span>￥{{ scope.row.totalPrice | toFixed2 }}</span>
</template>
</el-table-column>
<el-table-column prop="amount" label="商品实付" min-width="100" align="center">
<template slot-scope="scope">
<span>￥{{ scope.row.amount | toFixed2 }}</span>
</template>
</el-table-column>
<el-table-column
prop="goodsShowStatusStr"
label="状态"
min-width="100"
align="center"
:filters="getFilterArr('goodsShowStatusStr')"
:filter-method="filterStatusHandler"
>
</el-table-column>
<el-table-column prop="expressCompany" label="物流公司" min-width="100" align="center">
<template slot-scope="scope">
<span>{{scope.row.expressCompany || '--'}}</span>
</template>
</el-table-column>
<el-table-column prop="expressNo" label="物流公司单号" min-width="110" align="center">
<template slot-scope="scope">
<span>{{scope.row.expressNo || '--'}}</span>
</template>
</el-table-column>
<el-table-column
prop="belongPackage"
label="所属包裹"
min-width="100"
align="center"
:filters="getFilterArr('belongPackage')"
:filter-method="filterPackageHandler"
>
<template slot-scope="scope">
<span>{{scope.row.belongPackage || '--'}}</span>
</template>
</el-table-column>
<el-table-column prop="refundDesc" label="退款说明" min-width="100" align="center">
<template slot-scope="scope">
<el-button v-if="[6, 7, 8].includes(scope.row.goodsShowStatus)" type="text" @click="showRefundDetail(scope.row.aid)">查看</el-button>
<span v-else> -- </span>
</template>
</el-table-column>
</el-table>
<div class="total-set">
<p><span>商品总额：</span><span>￥{{orderDetailData.totalPrice | toFixed2}}</span></p>
<p><span>优惠：</span><span>-￥{{orderDetailData.totalCouponFee | toFixed2}}</span></p>
<p><span>&nbsp;运费：</span>
<span v-if="orderDetailData.expressFee == 0">免运费</span>
<span v-else-if="orderDetailData.expressFee != 0">￥{{orderDetailData.expressFee | toFixed2}}</span>
</p>
<p class="total-price" v-if="showStatus == 4"><span>应付：</span><span>￥{{(orderDetailData.totalPrice)| toFixed2}}</span></p>
<p class="total-price" v-else-if="showStatus == 5 || showStatus == 7"><span>实付：</span><span>￥0.00</span></p>
<p class="total-price" v-else><span>实付：</span><span>￥{{orderDetailData.amount | toFixed2}}</span></p>
</div>
<!-- 物流信息 -->
<div class="trade-info"> <div class="trade-info">
<el-card class="left-card"> <el-card class="left-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>{{storeType == 1 ? '物流' : '配送'}}信息</span> <span>{{storeType == 1 ? '物流' : '配送'}}信息</span>
</div> </div>
<div v-if="showStatus == 1 || showStatus == 2"> <!-- 物流信息 -->
<!-- <div v-if="storeType == 3">--> <div class="logistics-info">
<!-- <p>无配送信息，买家自提</p>--> <div class="title">收货信息</div>
<!-- </div>--> <p>{{ orderDetailData.receiverAddr }}</p>
<p>{{orderDetailData.receiver}} {{ orderDetailData.receiverMobile }}</p>
</div>
<div v-if="showStatus == 1 || showStatus == 2 || showStatus == 6">
<div>
<!-- 多包裹 -->
<div class="multi-package">
<el-tabs v-model="packageName" @tab-click="handlePackageClick">
<el-tab-pane v-for="(item, index) in expressList" :key="index" :label="item.packageName" :name="item.packageName">
<div class="package-img">
<div class="img-box" v-for="(goodsval, goodsindex) in item.goodsInfoList" :key="goodsindex">
<img :src="goodsval.goodsImageUrl" alt="">
<span class="img-tips">{{goodsval.goodsQuantity}}件</span>
</div>
</div>
<!-- 云鹊配送 小药房 && 线下配送-->
<div class="yq-logistics" v-if="(storeType == 2 && item.expressType == 2)">
<div class="title">
{{item.expressStatus !== 4 ? '云鹊配送中' : '云鹊配送完成'}}
</div>
<p>配送员：{{ item.senderName }}</p>
<p>手机号：{{ item.senderMobile }}</p>
<p>备注：{{ item.remark }}</p>
</div>
<!-- 物流信息 供货商 || 小药房 && 物流信息-->
<div
v-if="storeType == 1 || (storeType == 2 && item.expressType == 1)"
class="package-detail"
>
<div>物流公司：{{ item.expressCompany }}</div>
<div>快递单号：{{item.expressNo }}
<el-button type="text" @click="copyTxt(item.expressNo,index)">复制单号</el-button>
<input type="text" :id="`copyInput_${index}`" class="hidden-input" />
</div>
<div>备注：{{ item.remark }}</div>
</div>
<!-- 线上物流时间线 -- 订单展示状态,1已完成,2已发货,3待发货,4待支付,5交易关闭 -->
<div class="steps-logistics" v-if="item.expressType == 1 && (showStatus === 1 || showStatus === 2 || showStatus === 6)">
<el-steps direction="vertical" :active="0">
<el-step
v-for="item in expressData"
:title="item.time"
:description="item.context"
:key="item.time"
>
<div slot="icon">
<div class="dot"></div>
</div>
</el-step>
</el-steps>
</div>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
<!-- <div v-if="showStatus == 1 || showStatus == 2">
<div v-if="storeType == 3">
<p>无配送信息，买家自提</p>
</div>
<div> <div>
<p class="trade-status1"> <p class="trade-status1">
<i class="el-icon-truck" style="font-size: 18px"></i> <i class="el-icon-truck" style="font-size: 18px"></i>
...@@ -72,7 +215,7 @@ ...@@ -72,7 +215,7 @@
<div v-if="showStatus == 4"> <div v-if="showStatus == 4">
<p>暂无{{storeType == 1 ? '物流' : '配送'}}信息，待买家支付</p> <p>暂无{{storeType == 1 ? '物流' : '配送'}}信息，待买家支付</p>
</div> </div>
<div v-if="showStatus == 5"><p>交易已关闭</p></div> <div v-if="showStatus == 5"><p>交易已关闭</p></div> -->
</el-card> </el-card>
<el-card class="right-card"> <el-card class="right-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
...@@ -85,57 +228,23 @@ ...@@ -85,57 +228,23 @@
<p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">支付时间：{{orderDetailData.paymentTime}}</p> <p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">支付时间：{{orderDetailData.paymentTime}}</p>
<p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">&nbsp;&nbsp;&nbsp;招募人：{{orderDetailData.ownerName}}</p> <p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">&nbsp;&nbsp;&nbsp;招募人：{{orderDetailData.ownerName}}</p>
<p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">所属药代：{{orderDetailData.brokerName}}</p> <p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">所属药代：{{orderDetailData.brokerName}}</p>
<p>下单人手机号：{{orderDetailData.prescriberMobile}}</p> <!-- <p>下单人手机号：{{orderDetailData.prescriberMobile}}</p>
<p>订单类型：{{orderDetailData.saleTypeStr}}</p> <p>订单类型：{{orderDetailData.saleTypeStr}}</p>
<p v-if="orderDetailData.refundReason">退款原因：{{orderDetailData.refundReason}}</p> <p v-if="orderDetailData.refundReason">退款原因：{{orderDetailData.refundReason}}</p> -->
<!--<p>发货时间：{{orderDetailData.sendTime}}</p>--> <!--<p>发货时间：{{orderDetailData.sendTime}}</p>-->
<!--<p>成交时间：{{orderDetailData.finishTime}}</p>--> <!--<p>成交时间：{{orderDetailData.finishTime}}</p>-->
</div> </div>
</el-card> </el-card>
</div> </div>
<el-table :data="tableData" border class="item-table" style="width: 100%;margin-top: 30px;">
<el-table-column prop="goodsName" label="商品名称" min-width="100" align="center">
<template slot-scope="scope">
<div style="cursor: pointer;color: #449284" @click="goGoodsEdit(scope.row)">{{ scope.row.goodsName }}</div>
</template>
</el-table-column>
<el-table-column prop="size" label="规格" min-width="100" align="center"></el-table-column>
<el-table-column prop="goodsQuantity" label="数量" min-width="100" align="center">
<template slot-scope="scope">
<span>×{{ scope.row.goodsQuantity }}</span>
</template>
</el-table-column>
<el-table-column prop="price" label="单价" min-width="100" align="center">
<template slot-scope="scope">
<span>￥{{ scope.row.price | toFixed2 }}</span>
</template>
</el-table-column>
<el-table-column prop="status" label="状态" min-width="100" align="center">
<template slot-scope="scope">
<span>{{orderDetailData.showStatusStr}}</span>
</template>
</el-table-column>
</el-table>
<div class="total-set">
<p><span>商品总额：</span><span>￥{{orderDetailData.totalPrice | toFixed2}}</span></p>
<p><span>优惠：</span><span>-￥{{orderDetailData.totalCouponFee | toFixed2}}</span></p>
<p><span>&nbsp;运费：</span>
<span v-if="orderDetailData.expressFee == 0">免运费</span>
<span v-else-if="orderDetailData.expressFee != 0">￥{{orderDetailData.expressFee | toFixed2}}</span>
</p>
<p class="total-price" v-if="showStatus == 1 || showStatus == 2 || showStatus == 3"><span>实付：</span><span>￥{{orderDetailData.amount | toFixed2}}</span></p>
<p class="total-price" v-if="showStatus == 4"><span>应付：</span><span>￥{{(orderDetailData.totalPrice)| toFixed2}}</span></p>
<p class="total-price" v-if="showStatus == 5"><span>实付：</span><span>￥0.00</span></p>
</div>
</div> </div>
<send-set-dialog <!-- <send-set-dialog
:sendGoodsDialog="sendGoodsDialog" :sendGoodsDialog="sendGoodsDialog"
:dtType="dtType" :dtType="dtType"
:sendSetFormData="sendSetForm" :sendSetFormData="sendSetForm"
@closeSendSet="closeSendSet"> @closeSendSet="closeSendSet">
</send-set-dialog> </send-set-dialog> -->
</div> </div>
<el-dialog <!-- <el-dialog
class="tui-dialog" class="tui-dialog"
title="修改物流单号" title="修改物流单号"
:visible="showOrderNoFlag" :visible="showOrderNoFlag"
...@@ -156,14 +265,29 @@ ...@@ -156,14 +265,29 @@
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="confirmExpressNo">完成</el-button> <el-button size="small" type="primary" @click="confirmExpressNo">完成</el-button>
</span> </span>
</el-dialog> -->
<!-- 退款说明 -->
<el-dialog
class="refund-explain-dialog"
title="退款说明"
:visible.sync="refundDialog"
width="20%">
<div class="explain-content">退款方式：{{refundDialogData.refundWay}}</div>
<div class="explain-content">退款金额：{{refundDialogData.refundAmount | toFixed2}}</div>
<div class="explain-content">退款对象：{{refundDialogData.refundObject}}</div>
<div class="explain-content">退款理由：{{refundDialogData.refundReason}}</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="refundDialog = false">确 定</el-button>
</span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
// import { openLoading, closeLoading } from "../../utils/utils"; // import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue"; import BreadCrumb from "@/components/breadcrumb.vue";
import { queryOrderDetail, updateExpressNo, expressInfo } from '@/utils/shop'; import { queryOrderDetail, updateExpressNo, expressInfo, getRefundDesc } from '@/utils/shop';
import SendSetDialog from "@/components/shop/send-set-dialog"; import SendSetDialog from "@/components/shop/send-set-dialog";
export default { export default {
components: { components: {
BreadCrumb, BreadCrumb,
...@@ -221,7 +345,18 @@ ...@@ -221,7 +345,18 @@
dtType: 1, dtType: 1,
sendSetForm: {}, sendSetForm: {},
showOrderNoFlag: false, showOrderNoFlag: false,
expressType: 1 expressType: 1,
isShowRefundDetail: false, // 是否展示退款说明弹窗
showStatusStr: '', // 订单状态文案
packageName: '包裹1', // 多包裹name
expressIndex: 0, // 修改物流单号下标
refundDialog: false, // 退款说明弹窗
refundDialogData: {
refundWay: '',
refundAmount: '',
refundObject: '',
refundReason: ''
}
} }
}, },
created() { created() {
...@@ -232,16 +367,80 @@ ...@@ -232,16 +367,80 @@
this.jumPathThird = `/order-manage?storeId=${this.storeId}`; this.jumPathThird = `/order-manage?storeId=${this.storeId}`;
this.init(); this.init();
}, },
computed:{
statusImgUrl() {
// "订单展示状态：1已完成,2已发货,3待发货,4待支付,5已关闭,6部分发货,7已取消"
let imgUrl = '';
console.log(imgUrl);
switch (this.showStatus) {
case 1:
return (imgUrl = require(`../../assets/image/order/order_status1.png`));
case 2:
case 6:
return (imgUrl = require(`../../assets/image/order/order_status2.png`));
case 3:
case 4:
return (imgUrl = require(`../../assets/image/order/order_status3.png`));
case 5:
case 7:
return (imgUrl = require(`../../assets/image/order/order_status5.png`));
default:
return (imgUrl = '');
}
}
},
methods: { methods: {
// 多包裹切换获取包裹物流信息
handlePackageClick(tab) {
this.expressList.forEach(item => {
if (item.packageName === tab.name) {
this.viewLogistics(item.expressNo, this.orderDetailData.receiverMobile);
}
})
},
getPrice(value) {
let val;
if (value) {
val = (value / 100).toFixed(2);
} else {
val = 0.00;
}
return val;
},
// 退款说明
showRefundDetail(aid) {
getRefundDesc(aid).then(res => {
if (res.code == "000000") {
this.isShowRefundDetail = true;
let refundWayStr = '';
let refundObjectStr = '';
this.refundDialog = true;
refundWayStr = res.data.refundWay == 0 ? '仅退款，无需退货' : '退款退货';
refundObjectStr = res.data.refundObject == 1 ? '开单医生' : '支付用户';
res.data.refundWay = refundWayStr;
res.data.refundObject = refundObjectStr;
this.refundDialogData = res.data;
}
})
},
init() { init() {
queryOrderDetail(this.orderId).then(res => { queryOrderDetail(this.orderId).then(res => {
if (res.code == '000000') { if (res.code == '000000') {
const { goodsInfoDtoList } = res.data; const { goodsInfoDtoList, expressList } = res.data;
this.orderDetailData = {...res.data}; this.orderDetailData = {...res.data};
this.showStatus = res.data.showStatus; this.showStatus = res.data.showStatus;
this.showStatusStr = res.data.showStatusStr;
this.expressType = res.data.expressType; // 小店 1.普通快递，2云鹊快递 this.expressType = res.data.expressType; // 小店 1.普通快递，2云鹊快递
this.tableData = goodsInfoDtoList; this.tableData = goodsInfoDtoList;
this.viewLogistics() let expressNo = '';
goodsInfoDtoList.map(item => {
if (item.belongPackage == '包裹1') {
expressNo = item.expressNo
}
})
let receiverMobile = this.orderDetailData.receiverMobile;
this.expressList = expressList; // 包裹信息
this.viewLogistics(expressNo, receiverMobile);
} }
}) })
}, },
...@@ -300,9 +499,9 @@ ...@@ -300,9 +499,9 @@
} }
}); });
}, },
copyTxt() { copyTxt(expressNo,index) {
let txt = document.getElementById("copyInput"); let txt = document.getElementById(`copyInput_${index}`);
txt.value = this.orderDetailData.expressNo; txt.value = expressNo;
// if (navigator.userAgent.match(/(iPhone|iPod|iPad|Mac);?/i)) { // if (navigator.userAgent.match(/(iPhone|iPod|iPad|Mac);?/i)) {
if (navigator.userAgent.indexOf("Safari") > -1 && navigator.userAgent.indexOf("Chrome") < 1) { if (navigator.userAgent.indexOf("Safari") > -1 && navigator.userAgent.indexOf("Chrome") < 1) {
var el = document.createElement('input'); var el = document.createElement('input');
...@@ -330,22 +529,48 @@ ...@@ -330,22 +529,48 @@
this.$message.success('复制成功'); this.$message.success('复制成功');
}, },
//查看物流 //查看物流
viewLogistics() { viewLogistics(expressNo, receiverMobile) {
if (this.orderDetailData.expressNo && this.orderDetailData.receiverMobile) if (expressNo && receiverMobile)
expressInfo({ expressInfo({
expressNo: this.orderDetailData.expressNo, expressNo: expressNo,
receiverMobile: this.orderDetailData.receiverMobile, receiverMobile: receiverMobile,
}).then((res) => { }).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
if (res.data.data && res.data.data.length) { if (res.data.data && res.data.data.length) {
this.expressData = res.data.data; this.expressData = res.data.data;
} else { } else {
this.expressData[0].time = res.data.updateTime || ''; this.expressData = [{
this.expressData = this.expressData; time: res.data.updateTime || '',
context: "待揽收1"
}];
} }
} }
}); });
}, },
getFilterArr(value) {
let newFilterArr = [];
for (const newItem of this.tableData) {
let flag = true;
for (const item of newFilterArr) {
if(item.text == newItem[value]) {
flag = false;
}
}
if(newItem[value] && flag) {
newFilterArr.push({
text: newItem[value],
value: newItem[value]
})
}
}
return newFilterArr;
},
filterStatusHandler(value, row, column) {
return row.goodsShowStatusStr === value;
},
filterPackageHandler(value, row, column) {
return row.belongPackage === value;
},
}, },
filters: { filters: {
toFixed2: function (value) { toFixed2: function (value) {
...@@ -368,44 +593,84 @@ ...@@ -368,44 +593,84 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.order-detail-wrapper{ .order-detail-wrapper{
.el-dialog__wrapper {
.el-dialog {
.el-dialog__body {
padding: 0 20px;
.explain-content {
margin-bottom: 5px;
}
}
}
}
.el-table__column-filter-trigger i {
color: #0d9078;
font-size: 14px;
transform: scale(1);
}
.hidden-input { .hidden-input {
height: 0; height: 0;
} }
.order-detail-content{ .order-detail-content{
background: #fff; background: #fff;
padding: 10px; padding: 10px;
.header-title{ .order-detail-header {
padding: 10px 12px; border-bottom: 1px solid #efefef;
}
.header-title {
font-size: 13px; font-size: 13px;
color: #449284; color: #449284;
border-bottom: 1px solid #efefef; line-height: 35px;
} }
.detail-all-info{
.trade-status{ .trade-status{
display: flex; font-size: 20px;
align-items: center; padding-bottom: 15px;
justify-content: center;
padding: 30px 0;
text-align: center;
font-size: 24px;
img{ img{
width: 25px; width: 25px;
height: 25px; height: 25px;
margin-right: 15px; margin-right: 15px;
vertical-align: -6px;
} }
.set-icon{ .set-icon{
color: #449284; color: #449284;
font-size: 28px; font-size: 20px;
margin-right: 10px; margin-right: 10px;
} }
} }
.total-set{
text-align: right;
margin-top: 20px;
p{
font-size: 13px;
color: #999999;
line-height: 24px;
span:first-child{
display: inline-block;
width: 72px;
text-align: left;
}
span:last-child{
display: inline-block;
width: 90px;
}
}
.total-price{
font-size: 15px;
color: #333333;
margin-top: 5px;
}
}
.detail-all-info{
padding-bottom: 30px;
.trade-info{ .trade-info{
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
font-size: 13px; font-size: 13px;
justify-content: space-between; justify-content: space-between;
margin-top: 30px;
.el-card__body{ .el-card__body{
padding-top: 10px; padding-top: 10px;
} }
...@@ -431,10 +696,52 @@ ...@@ -431,10 +696,52 @@
height: 200px; height: 200px;
overflow-y: scroll; overflow-y: scroll;
} }
.logistics-info {
.title {
padding-bottom: 10px;
}
}
.multi-package {
.package-img {
display: flex;
.img-box {
width: 88px;
height: 88px;
background-color: #ccc;
position: relative;
margin-right: 10px;
img {
width: 88px;
height: 88px;
}
.img-tips {
position: absolute;
right: 4px;
bottom: 4px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
color: #666666;
}
}
}
.yq-logistics {
padding-top: 25px;
.title {
padding-bottom: 20px;
}
}
.package-detail {
padding-top: 15px;
#copyInput {
display: none;
}
}
}
} }
.right-card{ .right-card{
width: 28%; width: 28%;
display: inline-block; display: inline-block;
max-height: 240px;
} }
.left-card, .right-card{ .left-card, .right-card{
p{ p{
...@@ -451,29 +758,6 @@ ...@@ -451,29 +758,6 @@
clear: both clear: both
} }
} }
.total-set{
text-align: right;
margin-top: 10px;
p{
font-size: 13px;
color: #999999;
line-height: 24px;
span:first-child{
display: inline-block;
width: 72px;
text-align: left;
}
span:last-child{
display: inline-block;
width: 90px;
}
}
.total-price{
font-size: 15px;
color: #333333;
margin-top: 5px;
}
}
} }
} }
.el-button--text{ .el-button--text{
...@@ -516,5 +800,7 @@ ...@@ -516,5 +800,7 @@
border: 1px solid #999999; border: 1px solid #999999;
background-color: #b8b8b8; background-color: #b8b8b8;
} }
} }
</style> </style>
src/views/goods/order-manage.vue
浏览文件 @ 009f79d0
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
>导出订单</el-button >导出订单</el-button
> >
</div> </div>
<div class="button-container"> <!-- <div class="button-container">
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
...@@ -136,17 +136,26 @@ ...@@ -136,17 +136,26 @@
@click="ShowExportDialog(2)" @click="ShowExportDialog(2)"
>批量取消订单</el-button >批量取消订单</el-button
> >
</div> </div> -->
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-tabs v-model="activeName" @tab-click="handleClick"> <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全部" name="all"></el-tab-pane> <el-tab-pane label="全部" name="all"></el-tab-pane>
<el-tab-pane label="等待买家付款" name="first"></el-tab-pane> <el-tab-pane label="等待买家付款" name="first"></el-tab-pane>
<el-tab-pane label="等待发货" name="second"></el-tab-pane> <el-tab-pane label="等待发货" name="second"></el-tab-pane>
<el-tab-pane label="已发货" name="third"></el-tab-pane> <el-tab-pane label="已发货" name="third"></el-tab-pane>
<el-tab-pane label="交易成功" name="fourth"></el-tab-pane> <el-tab-pane label="交易成功" name="fourth"></el-tab-pane>
<el-tab-pane label="退款/关闭" name="five"></el-tab-pane> <el-tab-pane label="退款/关闭" name="five"></el-tab-pane>
</el-tabs> -->
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全部" name="all"></el-tab-pane>
<el-tab-pane label="待支付" name="first"></el-tab-pane>
<el-tab-pane label="待发货" name="second"></el-tab-pane>
<el-tab-pane label="已发货" name="third"></el-tab-pane>
<el-tab-pane label="已完成" name="fourth"></el-tab-pane>
<el-tab-pane label="已取消" name="six"></el-tab-pane>
<el-tab-pane label="退款/关闭" name="five"></el-tab-pane>
</el-tabs> </el-tabs>
<el-table <el-table
:data="tableData" :data="tableData"
...@@ -179,15 +188,25 @@ ...@@ -179,15 +188,25 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="showStatusStr" prop="goodsShowStatusStrList"
label="交易状态" label="交易状态"
min-width="100" min-width="100"
align="center" align="center"
> >
<template slot-scope="scope">
<!--<span>{{ scope.row.goodsName }}</span>-->
<p
v-for="(item, index) in scope.row.goodsShowStatusStrList"
:key="index"
class="p-normal"
>
{{ item }}
</p>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="amount" prop="amount"
label="实收款" label="订单实付"
min-width="100" min-width="100"
align="center" align="center"
> >
...@@ -195,6 +214,16 @@ ...@@ -195,6 +214,16 @@
<span>￥{{ scope.row.amount | toFixed2 }}</span> <span>￥{{ scope.row.amount | toFixed2 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="expressFee"
label="运费"
min-width="100"
align="center"
>
<template slot-scope="scope">
<span>￥{{ scope.row.expressFee | toFixed2 }}</span>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="prescriberName" prop="prescriberName"
label="创建人" label="创建人"
...@@ -258,6 +287,38 @@ ...@@ -258,6 +287,38 @@
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="goodsTotalPrice"
label="商品总额"
min-width="100"
align="center"
>
<template slot-scope="scope">
<p
v-for="(item, index) in scope.row.goodsTotalPriceList"
:key="index"
class="p-normal"
>
￥{{ item | toFixed2 }}
</p>
</template>
</el-table-column>
<el-table-column
prop="goodsRealPay"
label="商品实付"
min-width="100"
align="center"
>
<template slot-scope="scope">
<p
v-for="(item, index) in scope.row.goodsRealPayList"
:key="index"
class="p-normal"
>
￥{{ item | toFixed2 }}
</p>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="commissionAmount" prop="commissionAmount"
...@@ -266,12 +327,12 @@ ...@@ -266,12 +327,12 @@
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<!--<span>￥{{ scope.row.price }}</span>--> <p
<p v-if="scope.row.commissionAmount>0"> v-for="(item, index) in scope.row.goodsCommissionAmountList"
￥{{ scope.row.commissionAmount | toFixed2 }} :key="index"
</p> class="p-normal"
<p v-else> >
- ￥{{ item | toFixed2 }}
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
...@@ -322,7 +383,7 @@ ...@@ -322,7 +383,7 @@
<!--<el-button @click="closeTrade(scope.row)" type="text" size="small">关闭交易</el-button>--> <!--<el-button @click="closeTrade(scope.row)" type="text" size="small">关闭交易</el-button>-->
<!--<el-button @click="changePrice(scope.row)" type="text" size="small">修改价格</el-button>--> <!--<el-button @click="changePrice(scope.row)" type="text" size="small">修改价格</el-button>-->
<!-- <el-button @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>--> <!-- <el-button @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>-->
<el-button <!-- <el-button
v-if=" v-if="
scope.row.storeType == 1 && scope.row.storeType == 1 &&
scope.row.showStatus == 3 && scope.row.showStatus == 3 &&
...@@ -360,11 +421,9 @@ ...@@ -360,11 +421,9 @@
type="text" type="text"
size="small" size="small"
>配送完成</el-button >配送完成</el-button
> > -->
<el-button @click="goDetail(scope.row)" type="text" size="small" <el-button type="text" size="small" @click="goDetail(scope.row)">查看详情</el-button>
>查看详情</el-button <!-- <el-button
>
<el-button
v-if=" v-if="
(scope.row.storeType == 1 || scope.row.storeType == 2) && (scope.row.storeType == 1 || scope.row.storeType == 2) &&
scope.row.showStatus == 3 && scope.row.showStatus == 3 &&
...@@ -374,7 +433,7 @@ ...@@ -374,7 +433,7 @@
type="text" type="text"
size="small" size="small"
>退款退货</el-button >退款退货</el-button
> > -->
<!-- <el-button type="text" size="small">查看物流</el-button> --> <!-- <el-button type="text" size="small">查看物流</el-button> -->
</div> </div>
</template> </template>
...@@ -1278,6 +1337,9 @@ export default { ...@@ -1278,6 +1337,9 @@ export default {
} else if (this.activeName == "five") { } else if (this.activeName == "five") {
//交易关闭 //交易关闭
this.searchForm.showStatus = 5; this.searchForm.showStatus = 5;
} else if (this.activeName == "six") {
//交易关闭
this.searchForm.showStatus = 6;
} }
this.searchForm.pageNo = 1; this.searchForm.pageNo = 1;
this.searchList(); this.searchList();
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或