Skip to content

F
factory_front
Commit cacd6eec by zhuzhequan
Options

添加刷新商品信息功能

parent 1b645dcf
Showing with 102 additions and 39 deletions
src/api/order.ts
......@@ -2,7 +2,7 @@ import { BasePaginationData, BaseRespData } from '@/types/api'
import axios from './axios'
import {
LogListData,
OrderData,
OrderData, Refresh,
SearchForm,
SendOrderData,
ShipmentForm,
......@@ -136,3 +136,10 @@ export function cancelOrderApi(id: number) {
{ id },
)
}
export function refreshProductInfo(data: Refresh[]) {
return axios.post<never, BaseRespData<never>>(
'factory/customJomallOrder/refreshProductInfo',
data,
)
}
src/types/api/order.ts
......@@ -16,6 +16,11 @@ export interface Tab {
quantity: number
}
export interface Refresh {
id: number
}
export interface OrderData {
id: number
namespace?: string
......
src/views/order/index.vue
......@@ -86,7 +86,7 @@
class="item"
>
<ElButton type="warning" is-dark @click="downloadManuscript"
>下载稿件</ElButton
>下载稿件</ElButton
>
</span>
<span
......@@ -94,22 +94,27 @@
class="item"
>
<ElButton type="success" is-dark @click="reGenerateManuscript"
>重新下载稿件</ElButton
>重新下载稿件</ElButton
>
</span>
<span v-if="statusCode === 2 || statusCode === 3" class="item">
<ElButton type="primary" dark @click="printManuscript"
>打印生产单</ElButton
>打印生产单</ElButton
>
</span>
<span v-if="statusCode === 2" class="item">
<ElButton type="success" dark @click="exportManuscript"
>导出生产单</ElButton
>导出生产单</ElButton
>
</span>
<span class="item">
<ElButton type="warning" @click="addInternalTag"
>添加内部标签</ElButton
>添加内部标签</ElButton
>
</span>
<span v-if="statusCode === 2 || statusCode === 3|| statusCode === 4" class="item">
<ElButton type="primary" @click="refreshProduct"
>刷新商品信息</ElButton
>
</span>
<span v-if="statusCode === 3 || statusCode === 4" class="item">
......@@ -144,14 +149,14 @@
<span @click="openAll(row)">
<template v-if="!row.moreable">
展开全部<strong style="color: red"
>({{ row.productList.length }})</strong
>条商品信息<el-icon style="vertical-align: middle"
><ArrowDown /></el-icon
>({{ row.productList.length }})</strong
>条商品信息<el-icon style="vertical-align: middle"
><ArrowDown /></el-icon
></template>
<template v-else>
收起商品信息<el-icon style="vertical-align: middle"
><ArrowUp
/></el-icon>
><ArrowUp
/></el-icon>
</template>
</span>
</div>
......@@ -162,22 +167,22 @@
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">商品价:</span>
<span class="order-list-expand_item_value">{{
row.productAmount
}}</span>
row.productAmount
}}</span>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">小计:</span>
<span class="order-list-expand_item_value">{{
row.totalAmount || '--'
}}</span>
row.totalAmount || '--'
}}</span>
</div>
<div
v-if="row.totolBuyNumber"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_value"
>共{{ row.totolBuyNumber }}件</span
>共{{ row.totolBuyNumber }}件</span
>
</div>
</div>
......@@ -211,27 +216,27 @@
<div class="order-time_info">
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label"
>创建时间:</span
>创建时间:</span
>
<span class="order-list-expand_item_value">{{
row.createTime || '--'
}}</span>
row.createTime || '--'
}}</span>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label"
>确认时间:</span
>确认时间:</span
>
<span class="order-list-expand_item_value">{{
row.startStockingTime || '--'
}}</span>
row.startStockingTime || '--'
}}</span>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label"
>完成时间:</span
>完成时间:</span
>
<span class="order-list-expand_item_value">{{
row.finishTime || '--'
}}</span>
row.finishTime || '--'
}}</span>
</div>
</div>
</div>
......@@ -240,7 +245,8 @@
<div class="order-operate_info">
<div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openDetail(row.id)"
>查看详情</ElButton
>查看详情
</ElButton
>
</div>
<div
......@@ -251,13 +257,15 @@
text
type="primary"
@click="openShipment(row.id)"
>查看发货单</ElButton
>查看发货单
</ElButton
>
</div>
<div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openLog(row.id)"
>操作日志</ElButton
>操作日志
</ElButton
>
</div>
<div
......@@ -265,7 +273,8 @@
class="order-list-expand_item_info_title"
>
<ElButton text type="danger" @click="cancelOrder(row.id)"
>取消</ElButton
>取消
</ElButton
>
</div>
</div>
......@@ -288,14 +297,14 @@
<div class="order-detail_item">
<span class="label">第三方订单号:</span>
<span class="value" :title="scope.row.erpOrderNumber">{{
scope.row.erpOrderNumber || '--'
}}</span>
scope.row.erpOrderNumber || '--'
}}</span>
</div>
<div class="order-detail_item">
<span class="label">稿件下载状态:</span>
<span class="value" :title="scope.row.manuscriptStatusStr">{{
scope.row.manuscriptStatusStr || '--'
}}</span>
scope.row.manuscriptStatusStr || '--'
}}</span>
</div>
<div class="order-detail_item">
<span class="label">收货人:</span>
......@@ -308,8 +317,8 @@
<div class="order-detail_item">
<span class="label">收货地址:</span>
<span class="value" :title="scope.row.lanshouAddress">{{
scope.row.lanshouAddress
}}</span>
scope.row.lanshouAddress
}}</span>
</div>
<div class="order-detail_item">
<span class="label">邮编:</span>
......@@ -371,7 +380,8 @@
type="primary"
size="large"
@click="searchShipmentByOrderNumber"
>查询</el-button
>查询
</el-button
>
</div>
<Shipment
......@@ -439,10 +449,12 @@
<template #footer>
<div class="dialog-footer">
<el-button size="large" @click="shipmentVisible = false"
>取消</el-button
>取消
</el-button
>
<el-button size="large" type="primary" @click="saveShipment"
>发货</el-button
>发货
</el-button
>
</div>
</template>
......@@ -502,7 +514,7 @@ import {
getLogList,
getOrderDetail,
cancelOrderApi,
reGenerateScriptUrlApi,
reGenerateScriptUrlApi, refreshProductInfo,
} from '@/api/order'
import { showError, showConfirm } from '@/utils/ui'
import { useValue } from '@/utils/hooks/useValue'
......@@ -770,6 +782,36 @@ const exportManuscript = async () => {
showError(e)
}
}
const refreshProduct = async () => {
if (selection.value.length === 0) {
return ElMessage({
message: '请选择订单',
type: 'warning',
offset: window.innerHeight / 2,
})
}
try {
await showConfirm('是否刷新商品信息', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
} catch {
return
}
const res = await refreshProductInfo(selection.value.map(el => {
return {
id: el.id,
}
}))
ElMessage({
message: res.message,
type: 'success',
offset: window.innerHeight / 2,
})
await loadTabData()
search()
}
// 添加内部便签
const addInternalTag = async () => {
if (selection.value.length === 0) {
......@@ -860,6 +902,7 @@ const onChangeCurrentRow = (item: ProductList) => {
margin-bottom: 10px;
}
}
.header-filter-tab {
margin-top: 10px;
}
......@@ -897,12 +940,15 @@ const onChangeCurrentRow = (item: ProductList) => {
.order-list {
margin-top: 10px;
flex: 1;
:deep(.el-table__expand-icon > .el-icon) {
display: none;
}
:deep(.el-table__row) {
background-color: #f5f5f5;
}
:deep(.el-table__expanded-cell) {
padding: 0;
}
......@@ -917,10 +963,12 @@ const onChangeCurrentRow = (item: ProductList) => {
flex: 1;
display: flex;
align-items: center;
.label {
color: #aaa;
margin-right: 6px;
}
.value {
color: #000;
flex: 1;
......@@ -933,6 +981,7 @@ const onChangeCurrentRow = (item: ProductList) => {
.table-expand {
display: flex;
}
.order-operate {
width: 100px;
}
......@@ -983,6 +1032,7 @@ const onChangeCurrentRow = (item: ProductList) => {
.order-list-expand_more {
text-align: center;
padding: 10px 0;
span {
cursor: pointer;
}
......@@ -995,6 +1045,7 @@ const onChangeCurrentRow = (item: ProductList) => {
.order-operate_info {
padding: 20px;
:deep(.el-button) {
padding: 0;
font-size: 14px;
......
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 to comment