zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

虚拟订单展示物流bug

master
程 2023-04-17 17:41:16 +08:00
parent e954cf4d92
commit 73ce45aff9
3 changed files with 258 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
manager/src/views/order/order/fictitiousOrderList.vue
View File

@ -4,22 +4,10 @@
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
<Form-item label="订单号" prop="orderSn"> <Form-item label="订单号" prop="orderSn">
<Input <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 200px" />
type="text"
v-model="searchForm.orderSn"
placeholder="请输入订单号"
clearable
style="width: 200px"
/>
</Form-item> </Form-item>
<Form-item label="会员名称" prop="buyerName"> <Form-item label="会员名称" prop="buyerName">
<Input <Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 200px" />
type="text"
v-model="searchForm.buyerName"
placeholder="请输入会员名称"
clearable
style="width: 200px"
/>
</Form-item> </Form-item>
<Form-item label="订单状态" prop="orderStatus"> <Form-item label="订单状态" prop="orderStatus">
<Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px"> <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
@ -32,54 +20,30 @@
</Select> </Select>
</Form-item> </Form-item>
<Form-item label="下单时间"> <Form-item label="下单时间">
<DatePicker <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable
v-model="selectDate" @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
type="datetimerange"
format="yyyy-MM-dd"
clearable
@on-change="selectDateRange"
placeholder="选择起始时间"
style="width: 200px"
></DatePicker>
</Form-item> </Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Table <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10" sortable="custom"
:loading="loading" @on-sort-change="changeSort"></Table>
border
:columns="columns"
:data="data"
ref="table"
class="mt_10"
sortable="custom"
@on-sort-change="changeSort"
></Table>
<Row type="flex" justify="end" class="mt_10"> <Row type="flex" justify="end" class="mt_10">
<Page <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
:current="searchForm.pageNumber" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator
:total="total" show-sizer></Page>
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
</Row> </Row>
</Card> </Card>
</div> </div>
</template> </template>
<script> <script>
import * as API_Order from "@/api/order"; import * as API_Order from "@/api/order";
export default { export default {
name: "fictitiousOrderList", name: "fictitiousOrderList",
data() { data () {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
searchForm: { searchForm: {
@ -148,18 +112,18 @@
{ {
title: "订单状态", title: "订单状态",
key: "orderStatus", key: "orderStatus",
width:95, width: 95,
render: (h, params) => { render: (h, params) => {
if (params.row.orderStatus == "UNPAID") { if (params.row.orderStatus == "UNPAID") {
return h("div", [h("tag", {props: {color: "magenta"}}, "未付款")]); return h("div", [h("tag", { props: { color: "magenta" } }, "未付款")]);
} else if (params.row.orderStatus == "PAID") { } else if (params.row.orderStatus == "PAID") {
return h("div", [h("tag", {props: {color: "blue"}}, "已付款")]); return h("div", [h("tag", { props: { color: "blue" } }, "已付款")]);
} else if (params.row.orderStatus == "COMPLETED") { } else if (params.row.orderStatus == "COMPLETED") {
return h("div", [h("tag", {props: {color: "green"}}, "已完成")]); return h("div", [h("tag", { props: { color: "green" } }, "已完成")]);
} else if (params.row.orderStatus == "TAKE") { } else if (params.row.orderStatus == "TAKE") {
return h("div", [h("tag", {props: {color: "volcano"}}, "待核验")]); return h("div", [h("tag", { props: { color: "volcano" } }, "待核验")]);
} else if (params.row.orderStatus == "CANCELLED") { } else if (params.row.orderStatus == "CANCELLED") {
return h("div", [h("tag", {props: {color: "red"}}, "已取消")]); return h("div", [h("tag", { props: { color: "red" } }, "已取消")]);
} }
} }
}, },
@ -221,28 +185,28 @@
}, },
methods: { methods: {
// 初始化数据 // 初始化数据
init() { init () {
this.getDataList(); this.getDataList();
}, },
// 分页 改变页码 // 分页 改变页码
changePage(v) { changePage (v) {
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getDataList(); this.getDataList();
}, },
// 分页 改变页数 // 分页 改变页数
changePageSize(v) { changePageSize (v) {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索 // 搜索
handleSearch() { handleSearch () {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 列表排序 // 列表排序
changeSort(e) { changeSort (e) {
this.searchForm.sort = e.key; this.searchForm.sort = e.key;
this.searchForm.order = e.order; this.searchForm.order = e.order;
if (e.order === "normal") { if (e.order === "normal") {
@ -251,14 +215,14 @@
this.getDataList(); this.getDataList();
}, },
// 起止时间从新赋值 // 起止时间从新赋值
selectDateRange(v) { selectDateRange (v) {
if (v) { if (v) {
this.searchForm.startDate = v[0]; this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1]; this.searchForm.endDate = v[1];
} }
}, },
// 获取列表数据 // 获取列表数据
getDataList() { getDataList () {
this.loading = true; this.loading = true;
API_Order.getOrderList(this.searchForm).then((res) => { API_Order.getOrderList(this.searchForm).then((res) => {
this.loading = false; this.loading = false;
@ -271,14 +235,14 @@
this.loading = false; this.loading = false;
}, },
//确认收款 //确认收款
confirmPrice(v) { confirmPrice (v) {
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认收款", title: "确认收款",
content: "您确定要收款吗？", content: "您确定要收款吗？",
loading: true, loading: true,
onOk: () => { onOk: () => {
API_Order.orderPay(v.sn).then(res => { API_Order.orderPay(v.sn).then(res => {
if(res.success){ if (res.success) {
this.$Message.success("收款成功") this.$Message.success("收款成功")
this.getDataList() this.getDataList()
} }
@ -289,17 +253,18 @@
}, },
// 订单详情 // 订单详情
detail(v) { detail (v) {
console.log(v.orderType);
let sn = v.sn; let sn = v.sn;
this.$router.push({ this.$router.push({
name: "order-detail", name: "order-detail",
query: {sn: sn}, query: { sn: sn, orderType: v.orderType },
}); });
}, },
}, },
mounted() { mounted () {
this.init(); this.init();
}, },
}; };
</script> </script>

9
manager/src/views/order/order/orderDetail.vue
View File

@ -8,7 +8,8 @@
<Button v-if="allowOperation.cancel" @click="orderCancel" type="warning" ghost>订单取消</Button> <Button v-if="allowOperation.cancel" @click="orderCancel" type="warning" ghost>订单取消</Button>
<Button v-if="orderInfo.order.orderStatus === 'UNPAID'" @click="confirmPrice" type="primary">收款</Button> <Button v-if="orderInfo.order.orderStatus === 'UNPAID'" @click="confirmPrice" type="primary">收款</Button>
<Button @click="orderLog" type="info" ghost>订单日志</Button> <Button @click="orderLog" type="info" ghost>订单日志</Button>
<Button @click="printOrder" type="primary" ghost style="float:right;">打印发货单</Button> <Button @click="printOrder" type="primary" ghost style="float:right;"
v-if="$route.query.orderType != 'VIRTUAL'">打印发货单</Button>
</div> </div>
</Card> </Card>
<Card class="mt_10 clearfix"> <Card class="mt_10 clearfix">
@ -112,10 +113,10 @@
<div class="div-item-right">{{ orderInfo.order.remark }}</div> <div class="div-item-right">{{ orderInfo.order.remark }}</div>
</div> </div>
<div class="div-item" v-if="orderInfo.order.needReceipt == false"> <!-- <div class="div-item" v-if="orderInfo.order.needReceipt == false">
<div class="div-item-left">发票信息：</div> <div class="div-item-left">发票信息：</div>
<div class="div-item-right">暂无发票信息</div> <div class="div-item-right">暂无发票信息</div>
</div> </div> -->
<!-- <div class="div-item" v-if="orderInfo.order.needReceipt == true"> <!-- <div class="div-item" v-if="orderInfo.order.needReceipt == true">
<div class="div-item-left">发票抬头：</div> <div class="div-item-left">发票抬头：</div>
@ -163,7 +164,7 @@
</div> </div>
</div> --> </div> -->
<div class="div-item"> <div class="div-item" v-if="$route.query.orderType != 'VIRTUAL'">
<div class="div-item-left">配送方式：</div> <div class="div-item-left">配送方式：</div>
<div class="div-item-right"> <div class="div-item-right">
{{ orderInfo.deliveryMethodValue }} {{ orderInfo.deliveryMethodValue }}

48
seller/src/views/order/order/orderDetail.vue
View File

@ -487,7 +487,7 @@ export default {
liliMap, liliMap,
region, region,
}, },
data() { data () {
return { return {
typeList: [], typeList: [],
showPrices: false, showPrices: false,
@ -693,27 +693,27 @@ export default {
}, },
methods: { methods: {
//修改地址 //修改地址
regionClick() { regionClick () {
this.showRegion = true; this.showRegion = true;
this.regionId = ""; this.regionId = "";
}, },
//弹出订单核销框 //弹出订单核销框
orderTake() { orderTake () {
this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode; this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode;
this.orderTakeModal = true; this.orderTakeModal = true;
}, },
//打印发货单 //打印发货单
printOrder() { printOrder () {
this.printModal = true; this.printModal = true;
}, },
printHiddenInfo() { printHiddenInfo () {
this.printHiddenFlag = !this.printHiddenFlag; this.printHiddenFlag = !this.printHiddenFlag;
}, },
printCancel() { printCancel () {
// this.printHiddenFlag = false; // this.printHiddenFlag = false;
}, },
//订单核销提交 //订单核销提交
orderTakeSubmit() { orderTakeSubmit () {
this.$refs.orderTakeForm.validate((valid) => { this.$refs.orderTakeForm.validate((valid) => {
if (valid) { if (valid) {
API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then( API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then(
@ -728,14 +728,14 @@ export default {
} }
}); });
}, },
getOrderPrice() { getOrderPrice () {
if (this.showPrices) { if (this.showPrices) {
this.showPrices = false this.showPrices = false
} else if (!this.showPrices) { } else if (!this.showPrices) {
this.showPrices = true this.showPrices = true
} }
}, },
getContentPrice() { getContentPrice () {
for (let i = 0; i < this.typeList.length; i++) { for (let i = 0; i < this.typeList.length; i++) {
for (let j = i + 1; j < this.typeList.length; j++) { for (let j = i + 1; j < this.typeList.length; j++) {
if (this.typeList[i].promotionId === this.typeList[j].promotionId) { if (this.typeList[i].promotionId === this.typeList[j].promotionId) {
@ -751,7 +751,7 @@ export default {
} }
}, },
//获取订单详细信息 //获取订单详细信息
getDataDetail() { getDataDetail () {
this.loading = true; this.loading = true;
API_Order.getOrderDetail(this.sn).then((res) => { API_Order.getOrderDetail(this.sn).then((res) => {
this.loading = false; this.loading = false;
@ -766,7 +766,7 @@ export default {
} }
}); });
}, },
Toprint() { Toprint () {
this.facesheetFlag = true; this.facesheetFlag = true;
API_Logistics.getCheckedOn().then(res => { API_Logistics.getCheckedOn().then(res => {
if (res.success) { if (res.success) {
@ -776,13 +776,13 @@ export default {
}); });
}, },
// 修改订单金额 // 修改订单金额
modifyPrice() { modifyPrice () {
//默认要修改的金额为订单总金额 //默认要修改的金额为订单总金额
this.modifyPriceForm.orderPrice = this.orderInfo.order.flowPrice; this.modifyPriceForm.orderPrice = this.orderInfo.order.flowPrice;
this.modal = true; this.modal = true;
}, },
//修改订单金额提交 //修改订单金额提交
modifyPriceSubmit() { modifyPriceSubmit () {
this.$refs.modifyPriceForm.validate((valid) => { this.$refs.modifyPriceForm.validate((valid) => {
if (valid) { if (valid) {
API_Order.modifyOrderPrice(this.sn, this.modifyPriceForm).then( API_Order.modifyOrderPrice(this.sn, this.modifyPriceForm).then(
@ -798,12 +798,12 @@ export default {
}); });
}, },
// 选中的地址 // 选中的地址
selectedRegion(val) { selectedRegion (val) {
this.region = val[1]; this.region = val[1];
this.regionId = val[0]; this.regionId = val[0];
}, },
//查询物流 //查询物流
logistics() { logistics () {
this.logisticsModal = true; this.logisticsModal = true;
API_Order.getTraces(this.sn).then((res) => { API_Order.getTraces(this.sn).then((res) => {
if (res.success && res.result != null) { if (res.success && res.result != null) {
@ -812,7 +812,7 @@ export default {
}); });
}, },
//订单发货 //订单发货
orderDeliver() { orderDeliver () {
this.facesheetFlag = false this.facesheetFlag = false
if (this.logisticsType == 'SHUNFENG') { if (this.logisticsType == 'SHUNFENG') {
this.$Modal.confirm({ this.$Modal.confirm({
@ -839,7 +839,7 @@ export default {
} }
}, },
//顺丰打印面单 //顺丰打印面单
sfPrint() { sfPrint () {
API_Order.getOrderFaceSheet(this.sn, this.faceSheetForm).then(res => { API_Order.getOrderFaceSheet(this.sn, this.faceSheetForm).then(res => {
if (res.success) { if (res.success) {
let headers = { let headers = {
@ -869,13 +869,13 @@ export default {
} }
}) })
}, },
Toprints() { Toprints () {
if (this.form.logisticsId != null && this.form.logisticsId != '') { if (this.form.logisticsId != null && this.form.logisticsId != '') {
this.orderDeliverModal = false; this.orderDeliverModal = false;
} }
}, },
//订单发货提交 //订单发货提交
orderDeliverySubmit() { orderDeliverySubmit () {
if (this.facesheetFlag) { if (this.facesheetFlag) {
this.$refs['faceSheetForm'].validate((valid) => { this.$refs['faceSheetForm'].validate((valid) => {
if (valid) { if (valid) {
@ -904,7 +904,7 @@ export default {
} }
}, },
//弹出修改收货地址框 //弹出修改收货地址框
editAddress() { editAddress () {
this.addressModal = true; this.addressModal = true;
this.showRegion = false; this.showRegion = false;
this.regionId = this.orderInfo.order.consigneeAddressIdPath; this.regionId = this.orderInfo.order.consigneeAddressIdPath;
@ -918,7 +918,7 @@ export default {
this.orderInfo.order.consigneeAddressIdPath; this.orderInfo.order.consigneeAddressIdPath;
}, },
//修改收货地址 //修改收货地址
editAddressSubmit() { editAddressSubmit () {
if (this.regionId == "") { if (this.regionId == "") {
this.$Message.error("请选择地址"); this.$Message.error("请选择地址");
return; return;
@ -940,7 +940,7 @@ export default {
}); });
}, },
getLogisticsSetting() { getLogisticsSetting () {
API_Logistics.getLogisticsSetting().then(res => { API_Logistics.getLogisticsSetting().then(res => {
if (res.success) { if (res.success) {
this.logisticsType = res.result; this.logisticsType = res.result;
@ -949,13 +949,13 @@ export default {
}, },
}, },
mounted() { mounted () {
this.sn = this.$route.query.sn; this.sn = this.$route.query.sn;
this.getDataDetail(); this.getDataDetail();
this.getLogisticsSetting(); this.getLogisticsSetting();
}, },
// 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面 // 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
beforeRouteLeave(to, from, next) { beforeRouteLeave (to, from, next) {
if (to.name === 'orderList' || to.name === 'virtualOrderList') { if (to.name === 'orderList' || to.name === 'virtualOrderList') {
to.meta.keepAlive = true to.meta.keepAlive = true
} }