jiaxing.zhou

feat(router): 添加汇总申报功能并优化相关页面

- 在路由配置中添加汇总申报模块
- 更新汇总数据查询页面,修改订单编号为提单运号
-优化汇总详情页面的展示逻辑- 调整汇总时间字段显示
- 添加加载状态管理
......@@ -186,28 +186,35 @@ export const constantRoutes = [
// }
]
},
// {
// path: '/summary',
// component: Layout,
// hidden: false,
// meta: { title: '汇总申报', icon: 'fedexSummary' },
// children: [
// {
// path: '/summary',
// component: (resolve) => require(['@/views/summaryEdit/index'], resolve),
// hidden: false,
// name: 'Summary',
// meta: { title: '汇总申报', icon: '' }
// },
// {
// path: '/summaryDataSearch',
// component: (resolve) => require(['@/views/summaryDataSearch/index'], resolve),
// hidden: false,
// name: 'SummaryDataSearch',
// meta: { title: '汇总申请单查询', icon: '' }
// }
// ]
// },
{
path: '/summary',
component: Layout,
hidden: false,
meta: { title: '汇总申报', icon: 'fedexSummary' },
children: [
// {
// path: '/summary',
// component: (resolve) => require(['@/views/summaryEdit/index'], resolve),
// hidden: false,
// name: 'Summary',
// meta: { title: '汇总申报', icon: '' }
// },
// {
// path: '/summaryDataSearch',
// component: (resolve) => require(['@/views/summaryDataSearch/index'], resolve),
// hidden: false,
// name: 'SummaryDataSearch',
// meta: { title: '汇总申请单查询', icon: '' }
// }
{
path: '/summaryDetail',
component: (resolve) => require(['@/views/summaryDetail/index'], resolve),
name: 'summaryDetail',
hidden: true,
meta: { title: '汇总申请单详情', icon: '' }
}
]
},
// {
// path: '/system',
// component: Layout,
......
......@@ -220,17 +220,17 @@
@popoverClose="popoverClose"
>
<div slot="title">
<span style="font-weight: 700; color: #515a6e">订单编号:</span
>{{ scope.row.orderno }}
<span style="font-weight: 700; color: #515a6e">提单运号:</span
>{{ scope.row.billNo }}
</div>
<div slot="buttonLabel">
{{ scope.row.returnStatus }}
</div>
</TablePopover>
</template>
<template v-slot:orderNo="scope">
<template v-slot:preNo="scope">
<el-button type="text" @click="view(scope.row)">{{
scope.row.orderNo
scope.row.preNo
}}</el-button>
</template>
</Table>
......@@ -278,6 +278,7 @@ export default {
value: "preNo",
width: "",
align: "left",
slot: true,
},
{
name: "提运单号",
......@@ -317,7 +318,7 @@ export default {
},
{
name: "汇总时间",
value: "startTime"+"~"+"endTime",
value: "startTime",
width: "",
align: "left",
},
......@@ -433,7 +434,6 @@ export default {
this.receiptApi(val.data.copNo, val.status)
.then((res) => {
val.tableData.forEach((item) => {
console.log("item",item)
if (item.id == val.data.id) {
item.popoverData = res;
}
......@@ -442,6 +442,7 @@ export default {
})
.finally(() => {
this.$nextTick(() => {
this.$store.dispatch('setLoadingState', false)
this.$refs.returnStatusPopover.tableLoading = false;
});
});
......