Compare commits
No commits in common. "e48b7c020343d27d56b6219f640f5f49173849fc" and "97fa23869fbf12608626844bfba8b0fec0f10010" have entirely different histories.
e48b7c0203
...
97fa23869f
@ -1,4 +1,3 @@
|
||||
|
||||
import { createWebHistory, createRouter } from 'vue-router'
|
||||
/* Layout */
|
||||
import Layout from '@/layout'
|
||||
@ -93,38 +92,16 @@ export const constantRoutes = [
|
||||
component: () => import('@/views/goods/goodsManage/editGoods'),
|
||||
name: 'editGoods',
|
||||
meta: { title: '编辑商品', icon: '' }
|
||||
},
|
||||
{
|
||||
path: '/goods/goodsReview/auditGoods/:activeTab?',
|
||||
component: () => import('@/views/goods/goodsReview/auditGoods'),
|
||||
name: 'auditGoods',
|
||||
meta: { title: '审核商品', icon: '' }
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: '/order',
|
||||
component: Layout,
|
||||
hidden: true,
|
||||
redirect: 'noredirect',
|
||||
children: [
|
||||
{
|
||||
path: 'order/sendGoodsInfo/:activeTab?',
|
||||
component: () => import('@/views/order/sendGoodsInfo'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "去发货",
|
||||
icon: "star",
|
||||
},
|
||||
name: "sendGoodsInfo",
|
||||
},
|
||||
{
|
||||
path: 'order/orderDetails/:activeTab?',
|
||||
component: () => import('@/views/order/orderDetails'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "订单详情",
|
||||
icon: "star",
|
||||
},
|
||||
name: "orderDetails",
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
{
|
||||
path: '/user',
|
||||
component: Layout,
|
||||
hidden: true,
|
||||
@ -215,7 +192,31 @@ export const constantRoutes = [
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
}
|
||||
},
|
||||
{
|
||||
path: 'goods/contrabandManage',
|
||||
component: () => import('@/views/goods/contrabandManage/index'),
|
||||
name: 'contrabandManage',
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "违禁物品管理",
|
||||
icon: "",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'goods/goodsReview',
|
||||
component: () => import('@/views/goods/goodsReview/index'),
|
||||
name: 'goodsReview',
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "上架审核设置",
|
||||
icon: "",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
@ -327,122 +328,63 @@ export const constantRoutes = [
|
||||
name: "brand",
|
||||
component: Layout,
|
||||
hidden: false,
|
||||
children: [
|
||||
{
|
||||
path: 'brand/index',
|
||||
component: () => import('@/views/brand/index'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "公共品牌",
|
||||
icon: "star",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
name: "index",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: '/order',
|
||||
name: "order",
|
||||
component: Layout,
|
||||
hidden: false,
|
||||
alwaysShow: true,
|
||||
redirect: 'noredirect',
|
||||
meta: {
|
||||
title: "订单列表",
|
||||
icon: "documentation",
|
||||
noCache: false,
|
||||
icon: "money",
|
||||
link: null,
|
||||
noCache: false,
|
||||
title: "公共品牌",
|
||||
},
|
||||
children: [
|
||||
{
|
||||
path: 'order/obligation',
|
||||
component: () => import('@/views/order/obligation'),
|
||||
path: 'brand/informationManagement',
|
||||
component: () => import('@/views/brand/informationManagement/index'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "待付款",
|
||||
title: "信息管理",
|
||||
icon: "",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
name: "obligation",
|
||||
name: "informationManagement",
|
||||
},
|
||||
{
|
||||
path: 'order/sendGoods',
|
||||
component: () => import('@/views/order/sendGoods'),
|
||||
path: 'brand/applicationReview',
|
||||
component: () => import('@/views/brand/applicationReview/index'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "待发货",
|
||||
title: "申请审核",
|
||||
icon: "",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
name: "sendGoods",
|
||||
name: "applicationReview",
|
||||
},
|
||||
{
|
||||
path: 'order/shipped',
|
||||
component: () => import('@/views/order/shipped'),
|
||||
path: 'brand/renewal',
|
||||
component: () => import('@/views/brand/renewal/index'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "已发货",
|
||||
title: "申请续期",
|
||||
icon: "",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
name: "shipped",
|
||||
name: "renewal",
|
||||
},
|
||||
{
|
||||
path: 'order/receivedGoods',
|
||||
component: () => import('@/views/order/receivedGoods'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "已收货",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
name: "receivedGoods",
|
||||
},
|
||||
{
|
||||
path: 'order/completed',
|
||||
component: () => import('@/views/order/completed'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "已完成",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
name: "completed",
|
||||
},
|
||||
{
|
||||
path: 'order/cancelled',
|
||||
component: () => import('@/views/order/cancelled'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "已取消",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
name: "cancelled",
|
||||
},
|
||||
{
|
||||
path: 'order/salesService',
|
||||
component: () => import('@/views/order/salesService'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "退货/退款",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
name: "salesService",
|
||||
},
|
||||
{
|
||||
path: 'order/refunded',
|
||||
component: () => import('@/views/order/refunded'),
|
||||
hidden: false,
|
||||
meta: {
|
||||
title: "已退货/退款",
|
||||
noCache: false,
|
||||
link: null,
|
||||
},
|
||||
name: "refunded",
|
||||
},
|
||||
|
||||
// {
|
||||
// path: 'brand/management',
|
||||
// component: () => import('@/views/brand/management/index'),
|
||||
// hidden: false,
|
||||
// meta: {
|
||||
// title: "品牌使用管理",
|
||||
// icon: "",
|
||||
// noCache: false,
|
||||
// link: null,
|
||||
// },
|
||||
// name: "management",
|
||||
// },
|
||||
],
|
||||
},
|
||||
]
|
||||
@ -532,4 +474,4 @@ const router = createRouter({
|
||||
},
|
||||
})
|
||||
|
||||
export default router
|
||||
export default router
|
||||
|
||||
@ -194,9 +194,9 @@
|
||||
"
|
||||
class="order-list-warp-right-list"
|
||||
>
|
||||
<div>申请退款原因</div>
|
||||
<div>退款理由</div>
|
||||
<div style="color: #000000">
|
||||
{{ detailsData.refundReason }}
|
||||
{{ detailsData.totalQuantity }}
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
@ -206,31 +206,9 @@
|
||||
"
|
||||
class="order-list-warp-right-list"
|
||||
>
|
||||
<div>申请退款时间</div>
|
||||
<div>退款描述</div>
|
||||
<div style="color: #000000">
|
||||
{{ detailsData.refundApproveTime }}
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="
|
||||
detailsData.orderStatus == '10' ||
|
||||
detailsData.orderStatus == '11'
|
||||
"
|
||||
class="order-list-warp-right-list"
|
||||
>
|
||||
<div style="color: red">申请退款金额</div>
|
||||
<div style="color: red">￥{{ detailsData.payableAmount }}</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="
|
||||
detailsData.orderStatus == '10' &&
|
||||
detailsData.refundAuditResult
|
||||
"
|
||||
class="order-list-warp-right-list"
|
||||
>
|
||||
<div style="color: red">拒绝退款原因</div>
|
||||
<div style="color: red">
|
||||
{{ detailsData.refundFailReason }}
|
||||
{{ detailsData.totalQuantity }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="order-list-warp-right-list">
|
||||
@ -333,7 +311,6 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import { ElMessage } from "element-plus";
|
||||
import { ref, reactive, computed, onMounted, onBeforeUnmount } from "vue";
|
||||
import {
|
||||
createLogisticOrder,
|
||||
@ -441,22 +418,17 @@ const submit = () => {
|
||||
refund(
|
||||
refundState.value == "1"
|
||||
? {
|
||||
orderId: detailsData.value.id,
|
||||
id: detailsData.value.id,
|
||||
approveStatus: refundState.value,
|
||||
refundAmount: refundPrice.value,
|
||||
}
|
||||
: {
|
||||
orderId: detailsData.value.id,
|
||||
id: detailsData.value.id,
|
||||
approveStatus: refundState.value,
|
||||
refuseReason: rejectReason.value,
|
||||
}
|
||||
).then((res) => {
|
||||
dialogVisible.value = false;
|
||||
ElMessage({
|
||||
message: "操作成功",
|
||||
type: "success",
|
||||
plain: true,
|
||||
});
|
||||
getOrderDetails();
|
||||
});
|
||||
};
|
||||
|
||||
@ -280,7 +280,7 @@ const router = useRouter();
|
||||
const preserveExpanded = ref(true);
|
||||
const formInline = reactive({
|
||||
orderNo: "",
|
||||
orderStatus: "11",
|
||||
orderStatus: "3",
|
||||
current: 1,
|
||||
size: 10,
|
||||
receiverName: "",
|
||||
|
||||
@ -285,10 +285,10 @@
|
||||
<!-- 自定义-操作 -->
|
||||
<template #action="slotProps">
|
||||
<div @click="goSend(slotProps.row)" class="send-button">去发货</div>
|
||||
<div @click="upAddress(slotProps.row.id)" class="send-button">
|
||||
<div @click="upAddress(slotProps.row)" class="send-button">
|
||||
修改收货地址
|
||||
</div>
|
||||
<div @click="goSends(slotProps.row.id)" class="send-buttons-info">
|
||||
<div @click="goSends(slotProps.row)" class="send-buttons-info">
|
||||
查看详情
|
||||
</div>
|
||||
<!-- <el-tooltip effect="dark" placement="bottom-end">
|
||||
@ -418,10 +418,10 @@ const resetForm = () => {
|
||||
searchForm.value.resetFields();
|
||||
};
|
||||
|
||||
const goSends = (data) => {
|
||||
const goSends = (id) => {
|
||||
router.push({
|
||||
path: "/order/order/orderDetails",
|
||||
query: { data: data },
|
||||
query: { data: id },
|
||||
});
|
||||
};
|
||||
|
||||
@ -532,7 +532,7 @@ const generateMockData = () => {
|
||||
const upAddress = (data) => {
|
||||
dialogVisible.value = true;
|
||||
console.log("31231");
|
||||
upid.value = data;
|
||||
upid.value = data.id;
|
||||
|
||||
// router.push({
|
||||
// path: "/order/order/sendGoodsInfo",
|
||||
|
||||
@ -134,7 +134,6 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import { ElMessage } from "element-plus";
|
||||
import { ref, reactive, computed, onMounted, onBeforeUnmount } from "vue";
|
||||
import { createLogisticOrder } from "../../api/order/list";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
@ -143,6 +142,7 @@ const router = useRouter();
|
||||
const tableData = ref([]);
|
||||
const radio1 = ref("2");
|
||||
onMounted(() => {
|
||||
// console.log(JSON.parse(route.query.data));
|
||||
tableData.value = JSON.parse(route.query.data).orderItemInfos;
|
||||
});
|
||||
|
||||
@ -150,6 +150,7 @@ watch(
|
||||
() => route.query.data,
|
||||
(newSearch) => {
|
||||
if (route.query.data) {
|
||||
console.log(JSON.parse(route.query.data));
|
||||
tableData.value = JSON.parse(route.query.data).orderItemInfos;
|
||||
}
|
||||
}
|
||||
@ -218,11 +219,6 @@ const send = async () => {
|
||||
});
|
||||
console.log(response);
|
||||
if (response.code == 200) {
|
||||
ElMessage({
|
||||
message: "发货成功",
|
||||
type: "success",
|
||||
plain: true,
|
||||
});
|
||||
router.back();
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user