Skip to content

phsl / admin

Go to a project
Commit 70a6d28e by 芋道源码 Committed by Gitee
Options

!174 订单列表和详情 页面 

Merge pull request !174 from 矿泉水/dev
parents e1b1c134 ca01b160
Showing with 393 additions and 433 deletions
.env.dev
# 开发环境 # 开发环境
NODE_ENV=production NODE_ENV=development
VITE_DEV=false VITE_DEV=false
......
src/api/mall/trade/order/type/orderType.ts
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
// TODO @xiaobai：这个改成 TradeOrderRespVO // TODO @xiaobai：这个改成 TradeOrderRespVO
export interface TradeOrderPageItemRespVO { export interface TradeOrderPageItemRespVO {
// 订单编号 // 订单编号
id: number id?: number
// 订单流水号 // 订单流水号
no: string no?: string
// 下单时间 // 下单时间
createTime: Date createTime?: Date
// 订单类型 // 订单类型
type: number type?: number
// 订单来源 // 订单来源
terminal: number terminal?: number
// 用户编号 // 用户编号
userId: number userId?: number
// 用户 IP // 用户 IP
userIp: string userIp?: string
// 用户备注 // 用户备注
userRemark: string userRemark?: string
// 订单状态 // 订单状态
status: number status?: number
// 购买的商品数量 // 购买的商品数量
productCount: number productCount?: number
// 订单完成时间 // 订单完成时间
finishTime?: Date finishTime?: Date
// 订单取消时间 // 订单取消时间
...@@ -33,23 +33,23 @@ export interface TradeOrderPageItemRespVO { ...@@ -33,23 +33,23 @@ export interface TradeOrderPageItemRespVO {
// 支付订单编号 // 支付订单编号
payOrderId: number payOrderId: number
// 是否已支付 // 是否已支付
payed: boolean payed?: boolean
// 付款时间 // 付款时间
payTime?: Date payTime?: Date
// 支付渠道 // 支付渠道
payChannelCode: string payChannelCode?: string
// 商品原价（总） // 商品原价（总）
originalPrice: number originalPrice?: number
// 订单原价（总） // 订单原价（总）
orderPrice: number orderPrice?: number
// 订单优惠（总） // 订单优惠（总）
discountPrice: number discountPrice?: number
// 运费金额 // 运费金额
deliveryPrice: number deliveryPrice?: number
// 订单调价（总） // 订单调价（总）
adjustPrice: number adjustPrice?: number
// 应付金额（总） // 应付金额（总）
payPrice: number payPrice?: number
// 配送模板编号 // 配送模板编号
deliveryTemplateId?: number deliveryTemplateId?: number
// 发货物流公司编号 // 发货物流公司编号
...@@ -57,35 +57,37 @@ export interface TradeOrderPageItemRespVO { ...@@ -57,35 +57,37 @@ export interface TradeOrderPageItemRespVO {
// 发货物流单号 // 发货物流单号
logisticsNo?: string logisticsNo?: string
// 发货状态 // 发货状态
deliveryStatus: number deliveryStatus?: number
// 发货时间 // 发货时间
deliveryTime?: Date deliveryTime?: Date
// 收货时间 // 收货时间
receiveTime?: Date receiveTime?: Date
// 收件人名称 // 收件人名称
receiverName: string receiverName?: string
// 收件人手机 // 收件人手机
receiverMobile: string receiverMobile?: string
// 收件人地区编号 // 收件人地区编号
receiverAreaId: number receiverAreaId?: number
// 收件人邮编 // 收件人邮编
receiverPostCode: number receiverPostCode?: number
// 收件人详细地址 // 收件人详细地址
receiverDetailAddress: string receiverDetailAddress?: string
// 售后状态 // 售后状态
afterSaleStatus?: number afterSaleStatus?: number
// 退款金额 // 退款金额
refundPrice: number refundPrice?: number
// 优惠劵编号 // 优惠劵编号
couponId?: number couponId?: number
// 优惠劵减免金额 // 优惠劵减免金额
couponPrice: number couponPrice?: number
// 积分抵扣的金额 // 积分抵扣的金额
pointPrice: number pointPrice?: number
//收件人地区名字 //收件人地区名字
receiverAreaName: string receiverAreaName?: string
// 订单项列表 // 订单项列表
items: TradeOrderItemBaseVO[] items?: TradeOrderItemBaseVO[]
//用户信息
user?: MemberUserRespDTO
} }
// TODO @xiaobai：这个改成 TradeOrderItemRespVO // TODO @xiaobai：这个改成 TradeOrderItemRespVO
...@@ -98,70 +100,70 @@ export interface TradeOrderItemBaseVO { ...@@ -98,70 +100,70 @@ export interface TradeOrderItemBaseVO {
/** /**
* 编号 * 编号
*/ */
id: number id?: number
/** /**
* 用户编号 * 用户编号
*/ */
userId: number userId?: number
/** /**
* 订单编号 * 订单编号
*/ */
orderId: number orderId?: number
// ========== 商品基本信息 ========== // ========== 商品基本信息 ==========
/** /**
* 商品 SPU 编号 * 商品 SPU 编号
*/ */
spuId: number spuId?: number
/** /**
* 商品 SPU 名称 * 商品 SPU 名称
*/ */
spuName: string spuName?: string
/** /**
* 商品 SKU 编号 * 商品 SKU 编号
*/ */
skuId: number skuId?: number
/** /**
* 商品图片 * 商品图片
*/ */
picUrl: string picUrl?: string
/** /**
* 购买数量 * 购买数量
*/ */
count: number count?: number
// ========== 价格 + 支付基本信息 ========== // ========== 价格 + 支付基本信息 ==========
/** /**
* 商品原价（总） * 商品原价（总）
*/ */
originalPrice: number originalPrice?: number
/** /**
* 商品原价（单） * 商品原价（单）
*/ */
originalUnitPrice: number originalUnitPrice?: number
/** /**
* 商品优惠（总） * 商品优惠（总）
*/ */
discountPrice: number discountPrice?: number
/** /**
* 商品实付金额（总） * 商品实付金额（总）
*/ */
payPrice: number payPrice?: number
/** /**
* 子订单分摊金额（总） * 子订单分摊金额（总）
*/ */
orderPartPrice: number orderPartPrice?: number
/** /**
* 分摊后子订单实付金额（总） * 分摊后子订单实付金额（总）
*/ */
orderDividePrice: number orderDividePrice?: number
// ========== 营销基本信息 ========== // ========== 营销基本信息 ==========
// TODO 芋艿：在捉摸一下 // TODO 芋艿：在捉摸一下
// ========== 售后基本信息 ========== // ========== 售后基本信息 ==========
/** /**
* 售后状态 * 售后状态
*/ */
afterSaleStatus: number afterSaleStatus?: number
//属性数组 //属性数组
properties: ProductPropertyValueDetailRespVO[] properties?: ProductPropertyValueDetailRespVO[]
} }
/** /**
...@@ -171,17 +173,56 @@ export interface ProductPropertyValueDetailRespVO { ...@@ -171,17 +173,56 @@ export interface ProductPropertyValueDetailRespVO {
/** /**
* 属性的编号 * 属性的编号
*/ */
propertyId: number propertyId?: number
/** /**
* 属性的名称 * 属性的名称
*/ */
propertyName: string propertyName?: string
/** /**
* 属性值的编号 * 属性值的编号
*/ */
valueId: number valueId?: number
/** /**
* 属性值的名称 * 属性值的名称
*/ */
valueName: string valueName?: string
}
/**
* 订单详情查询 请求
*/
export interface TradeOrderPageReqVO {
pageNo: number
pageSize: number
no?: string
userId?: string
userNickname?: string
userMobile?: string
receiverName?: string
receiverMobile?: string
terminal?: string
type?: number
status?: number
payChannelCode?: string
createTime?: [Date, Date]
spuName?: string
itemCount?: string
all?: string
}
//用户信息
export interface MemberUserRespDTO {
id?: number
nickname?: string
status?: number
avatar?: string
mobile?: string
}
//订单详情选中type
export interface SelectType {
queryParams: TradeOrderPageReqVO
selectTotal: number //选中的数量
selectAllFlag: boolean //全选标识
selectData: Map<number, Set<string>> //存放涉及选中得页面以及每页选中得数据订单号 全选时根据条件查询 排除取消的list订单
unSelectList: Set<string> //登记取消的list 全选标识为true 时登记单独取消的list，再次选中时排除， 全选标识为false 时清空list
} }
src/views/mall/trade/order/index.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-select class="!w-280px" v-model="queryParams.status" clearable placeholder="全部"> <el-select class="!w-280px" v-model="queryParams.status" clearable placeholder="全部">
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_STATUS)" v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_STATUS)"
:key="dict.value" :key="(dict.value as string)"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
> >
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.PAY_CHANNEL_CODE_TYPE)" v-for="dict in getStrDictOptions(DICT_TYPE.PAY_CHANNEL_CODE_TYPE)"
:key="dict.value" :key="(dict.value as string)"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单来源" prop="terminal"> <el-form-item label="订单来源" prop="terminal">
<el-select class="!w-280px" v-model="queryParams.terminal" clearable placeholder="全部TODO"> <el-select class="!w-280px" v-model="queryParams.terminal" clearable placeholder="全部">
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.TERMINAL)" v-for="dict in getStrDictOptions(DICT_TYPE.TERMINAL)"
:key="dict.value" :key="(dict.value as string)"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
...@@ -58,28 +58,23 @@ ...@@ -58,28 +58,23 @@
<el-select class="!w-280px" v-model="queryParams.type" clearable placeholder="全部"> <el-select class="!w-280px" v-model="queryParams.type" clearable placeholder="全部">
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_TYPE)" v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_TYPE)"
:key="dict.value" :key="(dict.value as string)"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单搜索" prop="searchValue">
<!-- 双 item 绑定 2 个变量用于 reset 时没法重置 --> <el-form-item label="订单搜索">
<el-form-item class="!w-280px" prop="searchType">
<el-input <el-input
v-show="true"
class="!w-280px" class="!w-280px"
v-model="queryParams.searchValue" v-model="queryType.v"
clearable clearable
placeholder="请输入TODO" placeholder="请输入"
> >
<template #prepend> <template #prepend>
<el-select <el-select style="width: 110px" v-model="queryType.k" clearable placeholder="全部">
style="width: 100px"
v-model="queryParams.searchType"
clearable
placeholder="全部"
>
<el-option <el-option
v-for="dict in searchList" v-for="dict in searchList"
:key="dict.value" :key="dict.value"
...@@ -90,34 +85,33 @@ ...@@ -90,34 +85,33 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"> <el-button @click="handleQuery" v-hasPermi="['trade:order:query']">
<Icon class="mr-5px" icon="ep:search" /> <Icon class="mr-5px" icon="ep:search" />
搜索 搜索
</el-button> </el-button>
<el-button @click="resetQuery"> <el-button @click="resetQuery" v-hasPermi="['trade:order:query']">
<Icon class="mr-5px" icon="ep:refresh" /> <Icon class="mr-5px" icon="ep:refresh" />
重置 重置
</el-button> </el-button>
<!-- v-hasPermi="['trade:order:export']" TODO 待开发
需要将选中的数据存入orderSelect.multipleSelection中
需要考虑全选时数据如何处理-->
<el-button type="success" plain @click="handleExport" :loading="exportLoading"> <el-button type="success" plain @click="handleExport" :loading="exportLoading">
<!-- v-hasPermi="['trade:order:export']" -->
<Icon icon="ep:download" class="mr-5px" /> 导出TODO <Icon icon="ep:download" class="mr-5px" /> 导出TODO
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>
<!-- 表格 -->
<!-- 列表 -->
<ContentWrap> <ContentWrap>
<!-- 表单 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column type="expand" fixed="left"> <el-table-column type="expand" fixed="left">
<template #default="scope"> <template #default="scope">
<el-descriptions class="mx-40"> <el-descriptions class="mx-40">
<el-descriptions-item label="商品原价(总): ">{{ <el-descriptions-item label="商品原价(总): ">{{
'￥ ' + parseFloat(scope.row.originalPrice / 100).toFixed(2) + ' 元' '￥ ' +
parseFloat((scope.row.originalPrice / 100) as unknown as string).toFixed(2) +
' 元'
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="下单时间: "> <el-descriptions-item label="下单时间: ">
{{ formatDate(scope.row.createTime) }}</el-descriptions-item {{ formatDate(scope.row.createTime) }}</el-descriptions-item
...@@ -130,11 +124,11 @@ ...@@ -130,11 +124,11 @@
</el-descriptions> </el-descriptions>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="全选" type="selection" width="55" fixed="left">x</el-table-column> -->
<el-table-column width="100" fixed="left"> <el-table-column width="100" fixed="left">
<template #header> <template #header>
<el-dropdown icon="eq:search" @command="handleDropType"> <el-dropdown icon="eq:search" @command="handleDropType">
<el-button link type="primary">全选({{ orderSelect.checkTotal }}) </el-button> <el-button link type="primary">全选({{ orderSelect.selectTotal }}) </el-button>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item command="1">当前页</el-dropdown-item> <el-dropdown-item command="1">当前页</el-dropdown-item>
...@@ -160,6 +154,20 @@ ...@@ -160,6 +154,20 @@
<dict-tag :type="DICT_TYPE.TRADE_ORDER_TYPE" :value="scope.row.type" /> <dict-tag :type="DICT_TYPE.TRADE_ORDER_TYPE" :value="scope.row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户信息" align="center" min-width="100">
<template #default="scope">
<el-button link type="primary" @click="goUserDetail(scope.row)"
>{{ scope.row.userId }}{{ '[' + scope.row.user.nickname + ']' }}</el-button
>
</template>
</el-table-column>
<el-table-column
:formatter="dateFormatter"
align="center"
label="创建时间"
prop="createTime"
min-width="180"
/>
<el-table-column label="订单来源" align="center" min-width="100"> <el-table-column label="订单来源" align="center" min-width="100">
<template #default="scope"> <template #default="scope">
<dict-tag <dict-tag
...@@ -170,14 +178,7 @@ ...@@ -170,14 +178,7 @@
<span v-else>{{ scope.terminal }}</span> <span v-else>{{ scope.terminal }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户信息" align="center" min-width="100">
<!-- TODO xiaobai：展示昵称，跳转到用户详情 -->
<template #default="scope">
<el-button link type="primary" @click="goUserDetail(scope.row)">{{
scope.row.userId
}}</el-button>
</template>
</el-table-column>
<el-table-column label="商品信息" align="left" min-width="200" prop="items"> <el-table-column label="商品信息" align="left" min-width="200" prop="items">
<template #default="scope"> <template #default="scope">
<el-popover <el-popover
...@@ -204,18 +205,21 @@ ...@@ -204,18 +205,21 @@
<div v-for="item in scope.row.items" :key="item"> <div v-for="item in scope.row.items" :key="item">
<div> <div>
<p>{{ item.spuName }}</p> <p>{{ item.spuName }}</p>
<!-- TODO @xiaobai：不用 parseFloat 操作，直接 / 100.0 -->
<p>{{ <p>{{
'￥ ' + parseFloat(item.payPrice / 100).toFixed(2) + '元 x ' + item.count '￥ ' +
parseFloat((item.payPrice / 100) as unknown as string).toFixed(2) +
'元 x ' +
item.count
}}</p> }}</p>
</div> </div>
</div> </div>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际支付(元)" align="center" prop="payPrice" min-width="100"> <el-table-column label="实际支付(元)" align="center" prop="payPrice" min-width="100">
<template #default="scope"> <template #default="scope">
{{ '￥ ' + parseFloat(scope.row.payPrice / 100).toFixed(2) }} {{ '￥ ' + parseFloat((scope.row.payPrice / 100) as unknown as string).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -225,7 +229,6 @@ ...@@ -225,7 +229,6 @@
prop="payTime" prop="payTime"
min-width="180" min-width="180"
/> />
<!-- TODO @xiaobai：增加一个 createTime 时间的展示 -->
<el-table-column label="支付类型" align="center" min-width="100" prop="payChannelCode"> <el-table-column label="支付类型" align="center" min-width="100" prop="payChannelCode">
<template #default="scope"> <template #default="scope">
<dict-tag <dict-tag
...@@ -237,9 +240,8 @@ ...@@ -237,9 +240,8 @@
</el-table-column> </el-table-column>
<el-table-column label="订单状态" align="center" prop="status" min-width="100"> <el-table-column label="订单状态" align="center" prop="status" min-width="100">
<template #default="scope"> <template #default="scope">
<!-- TODO @xiaobai：不用做判断，直接 dict-tag 渲染就好列 -->
<dict-tag <dict-tag
v-if="scope.row.status === ''" v-if="scope.row.status !== ''"
:type="DICT_TYPE.TRADE_ORDER_STATUS" :type="DICT_TYPE.TRADE_ORDER_STATUS"
:value="scope.row.status" :value="scope.row.status"
/> />
...@@ -248,16 +250,16 @@ ...@@ -248,16 +250,16 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" min-width="150"> <el-table-column label="操作" align="center" fixed="right" min-width="150">
<template #default="scope"> <template #default="scope">
<el-button v-if="scope.row.status === 0" link type="primary" @click="sendXX(scope.row)"> <!-- <el-button v-if="scope.row.status == '0'" link type="primary" @click="sendXX(scope.row)"
待支付 >待支付</el-button> -->
</el-button> <el-button v-if="scope.row.status == '10'" link type="primary" @click="sendXX(scope.row)"
<el-button v-if="scope.row.status === 10" link type="primary" @click="sendXX(scope.row)"> >发货</el-button
发货 >
</el-button>
<el-button link type="primary" @click="showOrderDetail(scope.row)">详情</el-button> <el-button link type="primary" @click="showOrderDetail(scope.row)">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<Pagination <Pagination
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
...@@ -275,232 +277,243 @@ ...@@ -275,232 +277,243 @@
<script setup lang="ts" name="OrderList"> <script setup lang="ts" name="OrderList">
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import * as TradeOrderApi from '@/api/mall/trade/order' import * as TradeOrderApi from '@/api/mall/trade/order'
import {
TradeOrderPageReqVO,
SelectType,
TradeOrderPageItemRespVO
} from '@/api/mall/trade/order/type/orderType'
import { dateFormatter, formatDate } from '@/utils/formatTime' import { dateFormatter, formatDate } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
const message = useMessage() // 消息弹窗
const { push } = useRouter() // 路由
interface CurrentType {
checkTotal: number //选中的数量
currentType: string //页面选中类型, 0-noPage无选中页面 1-currentPage 当前页面 2-allPage所有页面
selectAll: boolean //全选标识
multipleSelection: [] // 选中的数据 暂未记录,需考虑全选时数据应该如何处理 ,部分选中可以使用该数据,需要登记
pageNoList: [] //当前页面选中的页号 如果再次选中当前页将取消本页面的选中数据 全选时 将所有的页面list 都放进去 再次全选时 全部清空
}
const orderSelect: CurrentType = reactive({
checkTotal: 0,
currentType: '0',
selectAll: false,
multipleSelection: [],
pageNoList: []
})
const loading = ref(false) // 列表的加载中 const message = useMessage()
const { push } = useRouter()
const imgViewVisible = ref(false) // 商品图预览
const imageViewerList = ref<string[]>([]) // 商品图预览列表
const queryFormRef = ref()
const loading = ref(false)
const exportLoading = ref(false)
const total = ref(0) // 总记录数 const total = ref(0) // 总记录数
const list = ref<any>([]) // 表数据 const list = ref<Array<TradeOrderPageItemRespVO | any>>([]) //表数据
const queryFormRef = ref() //表单搜索
const queryParams = ref({ //选中状态选中处理
pageNo: 1, // 首页 const orderSelect: SelectType = reactive({
pageSize: 10, // 页面大小 queryParams: {} as TradeOrderPageReqVO,
tabIndex: 0 // 详情页面数据 selectTotal: 0,
selectAllFlag: false,
selectData: new Map<number, Set<string>>(),
unSelectList: new Set<string>()
})
//表单搜索
const queryParams: TradeOrderPageReqVO = reactive({
pageNo: 1, //首页
pageSize: 10 //页面大小
}) })
const exportLoading = ref(false) // 导出按钮的加载中
// 订单搜索 const queryType = reactive({ k: '', v: '' }) // 订单搜索类型kv
/*
* 订单搜索
* 商品名称 商品件数 全部 需要后端支持TODO
*/
const searchList = ref([ const searchList = ref([
{ { value: 'no', label: '订单号' },
value: 'orderNo', { value: 'userId', label: '用户UID' },
label: '订单号' { value: 'userNickname', label: '用户昵称' },
}, { value: 'userMobile', label: '用户电话' },
{ { value: 'spuName', label: '商品名称TODO' },
value: 'userId', { value: 'itemCount', label: '商品件数TODO' }
label: '用户UID'
},
{
value: 'userName', // TODO @xiaobai：userNickname
label: '用户姓名'
},
{
value: 'userTel', // TODO @xiaobai：userMobile 改成
label: '用户电话'
},
{
value: 'itemName', // TODO @xiaobai：不用筛选
label: '商品名称'
},
{
value: 'itemCount', // TODO @xiaobai：件数不用筛选好列
label: '商品件数'
}
]) ])
const imgViewVisible = ref(false) // 商品图预览 /**
const imageViewerList = ref<string[]>([]) // 商品图预览列表
// TODO @xiaobai：要不全选逻辑先不做？ 当前页/？ 如果pageNo存在，则将但前数据全部按照单个选中模式取消 ,不存在，则新增全页 增加 Map.pageNo Map.roderNoList
/**当前页 所有页 暂不考虑数据本地化 会导致选中当前页 从后台重新拉取数据时出现数据不一致*/ 单个选中 如果pagelist存在，订单号选中状态取反，并对总数按选中状态加减。如果pagelist不存在，订单号选中状态取反，并对总数按选中状态加减，增加 Map.pageNo，
如果当前Map.pageNo 所对应list 为空 ，清除pageNo
* @param command ===1 当前页 选中 ===2 所有页面选中
*/
const handleDropType = (command: string) => { const handleDropType = (command: string) => {
orderSelect.currentType = command
let i = 0 let i = 0
//当前页按钮
if (command === '1') { if (command === '1') {
// pageNoList 当前页面选中的页号 如果再次选中当前页将取消本页面的选中数据 //如果该页面有选中数据 则选中事件触发时 取消该页面
//取消本页面记录 if (orderSelect.selectData && orderSelect.selectData.has(queryParams.pageNo)) {
var index = orderSelect.pageNoList.indexOf(queryParams.value.pageNo) for (i = 0; i < list.value.length; i++) {
if (index > -1) { if (orderSelect.selectData.get(queryParams.pageNo)!.has(list.value[i].id)) {
for (i; i < list.value.length; i++) { //选中数量减少
if (list.value[i]['itemSelect'] === true) { orderSelect.selectTotal -= 1
list.value[i]['itemSelect'] = false //考虑全选中，针对某一页面选中当前页时 会将所有数据中去掉该页面， 需要登记到 orderSelect.unSelectList
orderSelect.checkTotal = orderSelect.checkTotal - 1 unSelectListRecord(list.value[i].id, 'add')
} }
list.value[i]['itemSelect'] = false
} }
orderSelect.pageNoList.splice(index, 1) orderSelect.selectData.delete(queryParams.pageNo) //移除该页面
} else { } else {
for (i; i < list.value.length; i++) { //当前页选中状态中 默认全选中
if (list.value[i]['itemSelect'] === false) { orderSelect.selectData.set(queryParams.pageNo, new Set<string>())
for (i = 0; i < list.value.length; i++) {
list.value[i]['itemSelect'] = true list.value[i]['itemSelect'] = true
orderSelect.checkTotal = orderSelect.checkTotal + 1 orderSelect.selectData.get(queryParams.pageNo)!.add(list.value[i].id)
} //选中数量增加
orderSelect.selectTotal += 1
//对于登记过取消状态中的数据排除
unSelectListRecord(list.value[i].id, 'del')
} }
orderSelect.pageNoList.splice(0, 0, queryParams.value.pageNo)
} }
} }
//所有页按钮
if (command === '2') { if (command === '2') {
orderSelect.selectAll = !orderSelect.selectAll orderSelect.selectAllFlag = !orderSelect.selectAllFlag
//全选时 将所有的页面list 都放进去 再次全选时 全部清空
if (orderSelect.selectAll) { if (orderSelect.selectAllFlag) {
//打勾勾 //打勾勾 //全选
for (i; i < list.value.length; i++) { orderSelect.selectData?.set(queryParams.pageNo, new Set<string>())
for (i = 0; i < list.value.length; i++) {
list.value[i]['itemSelect'] = true list.value[i]['itemSelect'] = true
orderSelect.selectData?.get(queryParams.pageNo)?.add(list.value[i].id) //id是主键不重复
} }
// 初始化页面数组 orderSelect.selectTotal = total.value
const array1: [] = Array.from(
{ length: total.value / queryParams.value.pageSize + 1 },
(item, idx) => idx + 1
)
orderSelect.pageNoList = [] //清空原有的
orderSelect.pageNoList = [].concat(array1)
orderSelect.checkTotal = total.value
} else { } else {
//取消勾勾 //取消勾勾
for (i; i < list.value.length; i++) { for (i; i < list.value.length; i++) {
list.value[i]['itemSelect'] = false list.value[i]['itemSelect'] = false
} }
orderSelect.pageNoList = [] //清空 initSelect() //重置之前选中的类容清空
orderSelect.checkTotal = 0
} }
} }
} }
//对全选状态中的 单选或者当前页面单选时登记取消的数据
const unSelectListRecord = (id: string, op: string) => {
if (!orderSelect.selectAllFlag) {
return
}
if (op == 'add') {
orderSelect.unSelectList.add(id)
} else {
orderSelect.unSelectList.delete(id)
}
}
/***复选框选中 */ /***复选框选中 */
const handcheckclick = (row: any) => { const handcheckclick = (row: any) => {
//选中增加1 if (row.itemSelect) {
if (!row.itemSelect) { orderSelect.selectTotal += 1
// 取消 -1 if (!orderSelect.selectData.has(queryParams.pageNo)) {
orderSelect.checkTotal = orderSelect.checkTotal - 1 orderSelect.selectData?.set(queryParams.pageNo, new Set<string>())
// }
orderSelect.selectData?.get(queryParams.pageNo)?.add(row.id)
unSelectListRecord(row.id, 'del')
} else { } else {
//选中 +1 orderSelect.selectTotal -= 1
orderSelect.checkTotal = orderSelect.checkTotal + 1 orderSelect.selectData.get(queryParams.pageNo)?.delete(row.id)
unSelectListRecord(row.id, 'add')
} }
} }
/**
* 导出数据
*/
/** 查询列表 */ const handleExport = async () => {
const getList = async () => {
loading.value = true
try { try {
const data = await TradeOrderApi.getOrderList(queryParams.value) // 导出的二次确认
list.value = data.list await message.exportConfirm()
total.value = data.total //增加查询条件 用于全选时后台查询数据
orderSelect.queryParams = queryParams
let i = 0 // 发起导出
//给数组添加选中属性 itemSelect 默认为false 当前状态如果时全选 则新加载的页面都为选中状态 exportLoading.value = true
if ( //全选时 根据上送的条件查询所有数据，在排除unseleectList 数据，
orderSelect.currentType === '2' || //全选状态加载状态设置为选中 //非全选时， 根据上送的selectData 直接查询数据 后台实现导出数据接口即可
orderSelect.pageNoList.indexOf(queryParams.value.pageNo) > -1 //已选择页面加载状态设置为默认选中，会存在选中当前页面后手动取消该页面部分数据，再重新加载该页面时设置为选中状态，但是没有增加选中的数量 console.log(orderSelect)
) { download.excel(orderSelect as any, '订单信息.xls') //?
for (i; i < list.value.length; i++) { } catch {
list.value[i]['itemSelect'] = true
}
} else {
//还需要判断当前页面是否已经选中了? 而且还要出来选中的数据是否后来手动一行行取消了处理
for (i; i < list.value.length; i++) {
list.value[i]['itemSelect'] = false //暂定为未选中状态, 实际情况需要考虑已选中状态,后期优化
}
}
} finally { } finally {
loading.value = false exportLoading.value = false
} }
//TODO
exportLoading.value = false
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
//选中状态初始化
orderSelect.checkTotal = 0
orderSelect.currentType = '0'
orderSelect.multipleSelection = []
orderSelect.pageNoList = []
orderSelect.selectAll = false
// queryParams.pageNo = 1 TODO @xiaobai：缺了个
getList() getList()
} }
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
//选中状态初始化
orderSelect.checkTotal = 0
orderSelect.currentType = '0'
orderSelect.multipleSelection = []
orderSelect.pageNoList = []
orderSelect.selectAll = false
queryFormRef.value.resetFields() queryFormRef.value.resetFields()
queryType.v = '' //重置
queryType.k = ''
//休眠0.1s 等待watch响应
setTimeout(() => {
initSelect() //重置对选中设置恢复初始状态
handleQuery() handleQuery()
}, 100)
} }
/** /**选中状态初始化**/
* 导出数据 const initSelect = () => {
*/ orderSelect.queryParams = {} as TradeOrderPageReqVO
const handleExport = async () => { orderSelect.selectTotal = 0
orderSelect.selectAllFlag = false
orderSelect.selectData?.clear()
orderSelect.unSelectList?.clear()
}
const getList = async () => {
loading.value = true
try { try {
// 导出的二次确认 const data = await TradeOrderApi.getOrderList(queryParams)
await message.exportConfirm() list.value = data.list
// 发起导出 total.value = data.total
exportLoading.value = true let i = 0
//TODO导出的数据是后台导出还是从前端中获取数据(全选时数据怎么打印?) if (orderSelect.selectData && orderSelect.selectData.has(queryParams.pageNo)) {
download.excel(orderSelect.multipleSelection as any, '订单信息.xls') // //该页面已经加载过了。直接按照之前状态设置选中状态值
} catch { for (i = 0; i < list.value.length; i++) {
if (orderSelect.selectData.get(queryParams.pageNo)!.has(list.value[i].id)) {
list.value[i]['itemSelect'] = true //之前已经选取过了
} else {
list.value[i]['itemSelect'] = false
}
}
} else if (orderSelect.selectAllFlag) {
//全选状态中 首次加载页面 默认全部选中
orderSelect.selectData.set(queryParams.pageNo, new Set<string>())
for (i = 0; i < list.value.length; i++) {
list.value[i]['itemSelect'] = true
orderSelect.selectData.get(queryParams.pageNo)!.add(list.value[i].id)
}
} else {
//非全选状态中 首次加载默认非选中状态
for (i; i < list.value.length; i++) {
list.value[i]['itemSelect'] = false //设置状态为未选中状态
}
}
} finally { } finally {
exportLoading.value = false loading.value = false
} }
//TODO
exportLoading.value = false
} }
/** /**
* 跳转订单详情 * 跳转订单详情
*/ */
const showOrderDetail = (row: any) => { const showOrderDetail = (row: any) => {
push({ push({ name: 'TradeOrderDetail', query: { id: row.id } })
name: 'TradeOrderDetail',
query: {
id: row.id
}
})
} }
/** /**
* 跳转用户详情 TODO * 跳转用户详情
*/ */
const goUserDetail = (row: any) => { const goUserDetail = (row: any) => {
console.log('TODO User Detail: ' + row.userId) console.log('TODO User Detail: ' + row.userId)
} }
/** /**
* 发货 TODO * 发货
*/ */
const sendXX = (row: any) => { const sendXX = (row: any) => {
console.log('TODO Send XX: ' + row.no) console.log('TODO Send XX: ' + row.no)
} }
// TOPDO @xiaobai：https://kailong110120130.gitee.io/vue-element-plus-admin-doc/components/image-viewer.html 使用这个组件哈
/** /**
* 商品图预览 * 商品图预览
* @param imgUrl * @param imgUrl
...@@ -510,8 +523,50 @@ const imagePreview = (imgUrl: string) => { ...@@ -510,8 +523,50 @@ const imagePreview = (imgUrl: string) => {
imgViewVisible.value = true imgViewVisible.value = true
} }
//针对订单搜索类型和值进行调整 使用监听器
watch(
() => [queryType.k, queryType.v],
([newK, newV], [oldK]) => {
//重置oldK对应得value
if (oldK != newK) {
if (oldK == 'no' && queryParams.no != '') {
queryParams.no = ''
} else if (oldK == 'userId' && queryParams.userId != '') {
queryParams.userId = ''
} else if (oldK == 'userNickname' && queryParams.userNickname != '') {
queryParams.userNickname = ''
} else if (oldK == 'userMobile' && queryParams.userMobile !== '') {
queryParams.userMobile = ''
} else if (oldK == 'spuName' && queryParams.spuName !== '') {
queryParams.spuName = ''
} else if (oldK == 'itemCount' && queryParams.itemCount !== '') {
queryParams.itemCount = ''
} else if (oldK == '' && queryParams.all !== '') {
queryParams.all = ''
}
}
// 根据选中得k设置Value
if (newK == 'no') {
queryParams.no = newV
} else if (newK == 'userId') {
queryParams.userId = newV
} else if (newK == 'userNickname') {
queryParams.userNickname = newV
} else if (newK == 'userMobile') {
queryParams.userMobile = newV
} else if (newK == 'spuName') {
queryParams.spuName = newV
} else if (newK == 'itemCount') {
queryParams.itemCount = newV
} else if (newK == '') {
queryParams.all = newV
}
}
)
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(() => {
initSelect()
getList() getList()
}) })
</script> </script>
src/views/mall/trade/order/tradeOrderDetail-crmeb.vue deleted 100644 → 0
<template>
<el-drawer v-model="drawerVisiable" width="50%">
<el-form inline="true">
<el-form-item>
<div>
<span text="普通订单:">普通订单:</span>
<span text="订单号: ">1111112546</span>
</div>
</el-form-item>
<el-form-item> <el-button type="primary" icon="search">发送货</el-button></el-form-item>
<el-form-item><el-button type="success" icon="search">小票打印</el-button> </el-form-item>
<el-form-item>
<el-dropdown @command="handleCommand">
<el-button> ... </el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item command="remark">订单备注</el-dropdown-item>
<el-dropdown-item command="b">立即退款</el-dropdown-item>
<el-dropdown-item command="print">打印配货单</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-form-item>
</el-form>
<el-descriptions class="m-10" direction="vertical" column="4">
<el-descriptions-item label="订单状态">未发货TODO</el-descriptions-item>
<el-descriptions-item label="实际支付">1000 元 TODO</el-descriptions-item>
<el-descriptions-item label="支付方式">手机支付</el-descriptions-item>
<el-descriptions-item label="支付时间"> {{ formatDate(Date()) }}</el-descriptions-item>
</el-descriptions>
<el-tabs @tab-click="handleClick">
<el-tab-pane label="订单信息">
<el-descriptions title="订单信息">
<el-descriptions-item label="用户UID: ">kooriookami</el-descriptions-item>
<el-descriptions-item label="用户昵称: ">18100000000</el-descriptions-item>
<el-descriptions-item label="绑定电话: ">Suzhou</el-descriptions-item>
</el-descriptions>
<el-divider border-style="dashed" />
<el-descriptions title="收货信息" column="1">
<el-descriptions-item label="收货人: ">kooriookami</el-descriptions-item>
<el-descriptions-item label="收货电话: ">18100000000</el-descriptions-item>
<el-descriptions-item label="收货地址: ">{{ detailData }}</el-descriptions-item>
</el-descriptions>
<el-divider border-style="dashed" />
<el-descriptions title="供应商信息">
<el-descriptions-item label="供应商: ">kooriookami</el-descriptions-item>
<el-descriptions-item label="供应商姓名: ">18100000000</el-descriptions-item>
<el-descriptions-item label="联系方式: ">Suzhou</el-descriptions-item>
<el-descriptions-item label="供应商邮箱: ">Suzhou</el-descriptions-item>
</el-descriptions>
<el-divider border-style="dashed" />
<el-descriptions title="订单信息">
<el-descriptions-item label="创建时间: "> {{ formatDate(Date()) }} </el-descriptions-item>
<el-descriptions-item label="商品总数: ">18100000000</el-descriptions-item>
<el-descriptions-item label="商品总价: ￥">200.00 元</el-descriptions-item>
<el-descriptions-item label="优惠券金额: ￥">200.00 元</el-descriptions-item>
<el-descriptions-item label="积分抵扣: ">200.00</el-descriptions-item>
<el-descriptions-item label="支付邮费: ￥">200.00 元</el-descriptions-item>
<el-descriptions-item label="会员商品优惠: ￥">200.00 元</el-descriptions-item>
<el-descriptions-item label="推广人: ￥">200.00 元</el-descriptions-item>
<el-descriptions-item label="支付时间: "> {{ formatDate(Date()) }} </el-descriptions-item>
<el-descriptions-item label="支付方式: ￥">200.00 元</el-descriptions-item>
</el-descriptions>
<el-divider v-if="true" border-style="dashed" />
<el-descriptions v-if="true" title="订单备注">
<el-descriptions-item label="备注: ">TODO</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="商品信息">
<el-descriptions title="商品信息">
<el-descriptions-item label="用户UID: ">kooriookami</el-descriptions-item>
<el-descriptions-item label="用户昵称: ">18100000000</el-descriptions-item>
<el-descriptions-item label="绑定电话: ">Suzhou</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="订单记录">
<el-descriptions title="订单记录">
<el-descriptions-item label="用户UID: ">kooriookami</el-descriptions-item>
<el-descriptions-item label="用户昵称: ">18100000000</el-descriptions-item>
<el-descriptions-item label="绑定电话: ">Suzhou</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="发货记录">
<el-descriptions title="发货记录">
<el-descriptions-item label="用户UID: ">kooriookami</el-descriptions-item>
<el-descriptions-item label="用户昵称: ">18100000000</el-descriptions-item>
<el-descriptions-item label="绑定电话: ">Suzhou</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
</el-tabs>
</el-drawer>
</template>
<script lang="ts" name="tradeOrderDetail-crmeb" setup>
import { formatDate } from '@/utils/formatTime'
import * as TradeOrderApi from '@/api/mall/trade/order'
const message = useMessage() // 消息弹窗
const drawerVisiable = ref(false)
let detailData = reactive<any>({
items: [],
user: {}
}) //详情数据
const handleClick = () => {}
const handleCommand = (command: string) => {
console.log(command)
}
//暂考虑一次性加载详情页面所有数据
const queryDetail = async (no: string) => {
try {
const res = await TradeOrderApi.getOrderDetail(no)
console.log(res)
detailData.value = res
console.log(detailData.value)
} catch {
message.error('获取详情数据失败')
}
}
//显示详情
const show = async (no: string) => {
drawerVisiable.value = true
try {
queryDetail(no)
} finally {
}
}
defineExpose({ show }) //显示详情方法
</script>
<style>
.el-dropdown-link {
cursor: pointer;
color: #409eff;
}
.el-icon-arrow-down {
font-size: 12px;
}
</style>
src/views/mall/trade/order/tradeOrderDetail.vue
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
<el-descriptions-item label="付款方式: "> <el-descriptions-item label="付款方式: ">
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE_TYPE" :value="order.payChannelCode" /> <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE_TYPE" :value="order.payChannelCode" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="买家: ">{{ order.user.nickname }}</el-descriptions-item> <!-- <el-descriptions-item label="买家: ">{{ order.user.nickname }}</el-descriptions-item> -->
<!-- TODO 芋艿：待实现：跳转会员 --> <!-- TODO 芋艿：待实现：跳转会员 -->
<el-descriptions-item label="收货地址: "> <el-descriptions-item label="收货地址: ">
{{ order.receiverAreaName }} " "{{ order.receiverDetailAddress }} " " {{ order.receiverAreaName }} {{ order.receiverDetailAddress }}
<el-link <el-link
v-clipboard:copy="order.receiverAreaName + ' ' + order.receiverDetailAddress" v-clipboard:copy="order.receiverAreaName + ' ' + order.receiverDetailAddress"
v-clipboard:success="clipboardSuccess" v-clipboard:success="clipboardSuccess"
...@@ -37,7 +37,11 @@ ...@@ -37,7 +37,11 @@
<!-- 订单状态 --> <!-- 订单状态 -->
<el-descriptions title="订单状态" :column="1"> <el-descriptions title="订单状态" :column="1">
<el-descriptions-item label="订单状态: "> <el-descriptions-item label="订单状态: ">
<dict-tag :type="DICT_TYPE.TRADE_ORDER_STATUS" :value="order.status" /> <dict-tag
v-if="order.status !== ''"
:type="DICT_TYPE.TRADE_ORDER_STATUS"
:value="order.status"
/>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label-class-name="no-colon"> <el-descriptions-item label-class-name="no-colon">
<el-button type="primary" size="small">调整价格</el-button> <el-button type="primary" size="small">调整价格</el-button>
...@@ -68,12 +72,12 @@ ...@@ -68,12 +72,12 @@
<!-- 物流信息 TODO --> <!-- 物流信息 TODO -->
<!-- 商品信息 --> <!-- 商品信息 -->
<el-descriptions title="商品信息" column="6"> <el-descriptions title="商品信息">
<el-descriptions-item labelClassName="no-colon"> <el-descriptions-item labelClassName="no-colon">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="10"> <el-col :span="15">
<el-table :data="order.items" border> <el-table :data="order.items" border>
<el-table-column prop="spuName" label="商品" width="400"> <el-table-column prop="spuName" label="商品" width="auto">
<template #default="{ row }"> <template #default="{ row }">
{{ row.spuName }} {{ row.spuName }}
<el-tag <el-tag
...@@ -81,22 +85,18 @@ ...@@ -81,22 +85,18 @@
v-for="property in row.properties" v-for="property in row.properties"
:key="property.propertyId" :key="property.propertyId"
> >
{{ property.propertyName }}：{{ property.valueName }} {{ property.propertyName }}: {{ property.valueName }}</el-tag
</el-tag> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="originalUnitPrice" label="单价(元)" width="180"> <el-table-column prop="price" label="商品原价(元)" width="150">
<template #default="{ row }"> <template #default="{ row }"> ￥{{ (row.price / 100.0).toFixed(2) }} </template>
￥{{ (row.originalUnitPrice / 100.0).toFixed(2) }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="count" label="数量" width="100" /> <el-table-column prop="count" label="数量" width="100" />
<el-table-column prop="originalPrice" label="小计（元）" width="100"> <el-table-column prop="payPrice" label="合计(元)" width="150">
<template #default="{ row }"> <template #default="{ row }"> ￥{{ (row.payPrice / 100.0).toFixed(2) }} </template>
￥{{ (row.originalPrice / 100.0).toFixed(2) }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="afterSaleStatus" label="退款状态"> <el-table-column prop="afterSaleStatus" label="售后状态" width="auto">
<template #default="{ row }"> <template #default="{ row }">
<dict-tag <dict-tag
:type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS" :type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS"
...@@ -114,25 +114,33 @@ ...@@ -114,25 +114,33 @@
</el-descriptions> </el-descriptions>
<el-descriptions column="6"> <el-descriptions column="6">
<el-descriptions-item label="商品总额: "> <el-descriptions-item label="商品总额: ">
￥{{ (order.originalPrice / 100.0).toFixed(2) }} ￥{{ parseFloat((order.totalPrice / 100.0) as unknown as string).toFixed(2) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="运费金额: "> <el-descriptions-item label="运费金额: ">
￥{{ (order.deliveryPrice / 100.0).toFixed(2) }} ￥{{ parseFloat((order.deliveryPrice / 100.0) as unknown as string).toFixed(2) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单调价: "> <el-descriptions-item label="订单调价: ">
￥{{ (order.adjustPrice / 100.0).toFixed(2) }} ￥{{
</el-descriptions-item> parseFloat((order.adjustPrice / 100.0) as unknown as string).toFixed(2)
}}</el-descriptions-item
>
<el-descriptions-item> <el-descriptions-item>
<template #label><span style="color: red">商品优惠: </span></template> <template #label><span style="color: red">商品优惠: </span></template>
￥{{ ((order.originalPrice - order.originalPrice) / 100.0).toFixed(2) }} <!-- 没理解TODO order.totalPrice - order.totalPrice -->
￥{{
parseFloat(((order.totalPrice - order.totalPrice) / 100.0) as unknown as string).toFixed(
2
)
}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template #label><span style="color: red">订单优惠: </span></template> <template #label><span style="color: red">订单优惠: </span></template>
￥{{ (order.discountPrice / 100.0).toFixed(2) }} ￥{{ parseFloat((order.discountPrice / 100.0) as unknown as string).toFixed(2) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template #label><span style="color: red">积分抵扣: </span></template> <template #label><span style="color: red">积分抵扣: </span></template>
￥{{ (order.pointPrice / 100.0).toFixed(2) }} ￥{{ parseFloat((order.pointPrice / 100.0) as unknown as string).toFixed(2) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-for="item in 5" label-class-name="no-colon" :key="item" /> <el-descriptions-item v-for="item in 5" label-class-name="no-colon" :key="item" />
...@@ -160,15 +168,10 @@ ...@@ -160,15 +168,10 @@
<!-- 物流信息 --> <!-- 物流信息 -->
<!-- TODO @xiaobai：改成一个包裹哈；目前只允许发货一次 --> <!-- TODO @xiaobai：改成一个包裹哈；目前只允许发货一次 -->
<el-descriptions-item v-if="group.key === 'expressInfo'" labelClassName="no-colon"> <el-descriptions-item v-if="group.key === 'expressInfo'" labelClassName="no-colon">
<el-tabs type="card">
<!-- 循环包裹物流信息 --> <!-- 循环包裹物流信息 -->
<el-tab-pane <div v-show="(pkgInfo = detailInfo[group.key]) !== null" style="border: 1px dashed">
v-for="pkgInfo in detailInfo[group.key]"
:key="pkgInfo.label"
:label="pkgInfo.label"
>
<!-- 包裹详情 --> <!-- 包裹详情 -->
<el-descriptions> <el-descriptions class="m-5">
<el-descriptions-item <el-descriptions-item
v-for="(pkgChild, pkgCIdx) in group.children" v-for="(pkgChild, pkgCIdx) in group.children"
v-bind="pkgChild.childProps" v-bind="pkgChild.childProps"
...@@ -187,12 +190,10 @@ ...@@ -187,12 +190,10 @@
:src="goodInfo.imgUrl" :src="goodInfo.imgUrl"
/> />
<el-descriptions :column="1"> <el-descriptions :column="1">
<el-descriptions-item labelClassName="no-colon"> <el-descriptions-item labelClassName="no-colon">{{
{{goodInfo.name }} goodInfo.name
</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="数量"> <el-descriptions-item label="数量">{{ goodInfo.count }}</el-descriptions-item>
{{goodInfo.count }}
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </template>
...@@ -218,8 +219,7 @@ ...@@ -218,8 +219,7 @@
</template> </template>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-tab-pane> </div>
</el-tabs>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
...@@ -261,7 +261,7 @@ const detailGroups = ref([ ...@@ -261,7 +261,7 @@ const detailGroups = ref([
]) ])
const detailInfo = ref({ const detailInfo = ref({
expressInfo: [ expressInfo:
// 物流信息 // 物流信息
{ {
label: '包裹1', label: '包裹1',
...@@ -292,8 +292,7 @@ const detailInfo = ref({ ...@@ -292,8 +292,7 @@ const detailInfo = ref({
timestamp: '2018-04-11 12:55:52' timestamp: '2018-04-11 12:55:52'
} }
] ]
} },
],
orderLog: [ orderLog: [
// 订单操作日志 // 订单操作日志
{ {
...@@ -307,13 +306,14 @@ const detailInfo = ref({ ...@@ -307,13 +306,14 @@ const detailInfo = ref({
], ],
goodsInfo: [] // 商品详情tableData goodsInfo: [] // 商品详情tableData
}) })
// 暂考虑一次性加载详情页面所有数据 TODO @xiaobai：getDetail // 暂考虑一次性加载详情页面所有数据 TODO
const getlist = async () => { const getlist = async () => {
dialogVisible.value = true dialogVisible.value = true
loading.value = true loading.value = true
try { try {
const res = await TradeOrderApi.getOrderDetail(queryParams.id) const res = await TradeOrderApi.getOrderDetail(queryParams.id as unknown as number)
order.value = res order.value = res
console.log(order)
} catch { } catch {
message.error('获取详情数据失败') message.error('获取详情数据失败')
} finally { } finally {
...@@ -332,9 +332,11 @@ const clipboardSuccess = () => { ...@@ -332,9 +332,11 @@ const clipboardSuccess = () => {
&:not(:nth-child(1)) { &:not(:nth-child(1)) {
margin-top: 20px; margin-top: 20px;
} }
.el-descriptions__title { .el-descriptions__title {
display: flex; display: flex;
align-items: center; align-items: center;
&::before { &::before {
content: ''; content: '';
display: inline-block; display: inline-block;
...@@ -344,10 +346,13 @@ const clipboardSuccess = () => { ...@@ -344,10 +346,13 @@ const clipboardSuccess = () => {
background-color: #409eff; background-color: #409eff;
} }
} }
.el-descriptions-item__container { .el-descriptions-item__container {
margin: 0 10px; margin: 0 10px;
.no-colon { .no-colon {
margin: 0; margin: 0;
&::after { &::after {
content: ''; content: '';
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment