Commit 751c69da authored by dragondean@qq.com's avatar dragondean@qq.com

优化订单详情操作日志加载状态和时间

parent 3e7df93c
...@@ -684,6 +684,7 @@ export function operateLogPage(params){ ...@@ -684,6 +684,7 @@ export function operateLogPage(params){
return request({ return request({
url: '/ecw/order-operate-log/page', url: '/ecw/order-operate-log/page',
method: 'get', method: 'get',
params: params params: params,
timeout: 5 * 60000
}) })
} }
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
</el-tab-pane> </el-tab-pane>
<!-- 这个地方v-hasPermi不生效,所以换checkPermi函数检查 --> <!-- 这个地方v-hasPermi不生效,所以换checkPermi函数检查 -->
<el-tab-pane :label="$t('操作日志')" name="five" v-if="checkPermi(['ecw:order:logs'])"> <el-tab-pane :label="$t('操作日志')" name="five" v-if="checkPermi(['ecw:order:logs'])">
<el-table :data="logs"> <el-table :data="logs" v-loading="logsLoading">
<el-table-column :label="$t('时间')" width="150"> <el-table-column :label="$t('时间')" width="150">
<template slot-scope="{row}">{{ parseTime(row.createTime) }}</template> <template slot-scope="{row}">{{ parseTime(row.createTime) }}</template>
</el-table-column> </el-table-column>
...@@ -441,7 +441,7 @@ export default { ...@@ -441,7 +441,7 @@ export default {
showWarehouseInItemId: null, // 当前显示的入仓 showWarehouseInItemId: null, // 当前显示的入仓
showFeeDetailDialog: null, // 是否显示费用详情弹层 showFeeDetailDialog: null, // 是否显示费用详情弹层
feeDetail: null, // 费用详情 feeDetail: null, // 费用详情
logsLoading: false, // 日志加载中
logs: [], // 操作日志 logs: [], // 操作日志
} }
}, },
...@@ -640,8 +640,11 @@ export default { ...@@ -640,8 +640,11 @@ export default {
}, },
// 加载操作日志 // 加载操作日志
loadLogs(){ loadLogs(){
this.logsLoading = true
operateLogPage({orderId: this.orderId, page: 1, rows: 10000}).then(res => { operateLogPage({orderId: this.orderId, page: 1, rows: 10000}).then(res => {
this.logs = res.data.list this.logs = res.data.list
}).finally(() => {
this.logsLoading = false
}) })
}, },
downloadPackingList(){ downloadPackingList(){
......
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