jiaxing.zhou

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

- 在路由配置中添加汇总申报模块
- 更新汇总数据查询页面,修改订单编号为提单运号
-优化汇总详情页面的展示逻辑- 调整汇总时间字段显示
- 添加加载状态管理
...@@ -186,28 +186,35 @@ export const constantRoutes = [ ...@@ -186,28 +186,35 @@ export const constantRoutes = [
186 // } 186 // }
187 ] 187 ]
188 }, 188 },
189 - // { 189 + {
190 - // path: '/summary', 190 + path: '/summary',
191 - // component: Layout, 191 + component: Layout,
192 - // hidden: false, 192 + hidden: false,
193 - // meta: { title: '汇总申报', icon: 'fedexSummary' }, 193 + meta: { title: '汇总申报', icon: 'fedexSummary' },
194 - // children: [ 194 + children: [
195 - // { 195 + // {
196 - // path: '/summary', 196 + // path: '/summary',
197 - // component: (resolve) => require(['@/views/summaryEdit/index'], resolve), 197 + // component: (resolve) => require(['@/views/summaryEdit/index'], resolve),
198 - // hidden: false, 198 + // hidden: false,
199 - // name: 'Summary', 199 + // name: 'Summary',
200 - // meta: { title: '汇总申报', icon: '' } 200 + // meta: { title: '汇总申报', icon: '' }
201 - // }, 201 + // },
202 - // { 202 + // {
203 - // path: '/summaryDataSearch', 203 + // path: '/summaryDataSearch',
204 - // component: (resolve) => require(['@/views/summaryDataSearch/index'], resolve), 204 + // component: (resolve) => require(['@/views/summaryDataSearch/index'], resolve),
205 - // hidden: false, 205 + // hidden: false,
206 - // name: 'SummaryDataSearch', 206 + // name: 'SummaryDataSearch',
207 - // meta: { title: '汇总申请单查询', icon: '' } 207 + // meta: { title: '汇总申请单查询', icon: '' }
208 - // } 208 + // }
209 - // ] 209 + {
210 - // }, 210 + path: '/summaryDetail',
211 + component: (resolve) => require(['@/views/summaryDetail/index'], resolve),
212 + name: 'summaryDetail',
213 + hidden: true,
214 + meta: { title: '汇总申请单详情', icon: '' }
215 + }
216 + ]
217 + },
211 // { 218 // {
212 // path: '/system', 219 // path: '/system',
213 // component: Layout, 220 // component: Layout,
......
...@@ -220,17 +220,17 @@ ...@@ -220,17 +220,17 @@
220 @popoverClose="popoverClose" 220 @popoverClose="popoverClose"
221 > 221 >
222 <div slot="title"> 222 <div slot="title">
223 - <span style="font-weight: 700; color: #515a6e">订单编号:</span 223 + <span style="font-weight: 700; color: #515a6e">提单运号:</span
224 - >{{ scope.row.orderno }} 224 + >{{ scope.row.billNo }}
225 </div> 225 </div>
226 <div slot="buttonLabel"> 226 <div slot="buttonLabel">
227 {{ scope.row.returnStatus }} 227 {{ scope.row.returnStatus }}
228 </div> 228 </div>
229 </TablePopover> 229 </TablePopover>
230 </template> 230 </template>
231 - <template v-slot:orderNo="scope"> 231 + <template v-slot:preNo="scope">
232 <el-button type="text" @click="view(scope.row)">{{ 232 <el-button type="text" @click="view(scope.row)">{{
233 - scope.row.orderNo 233 + scope.row.preNo
234 }}</el-button> 234 }}</el-button>
235 </template> 235 </template>
236 </Table> 236 </Table>
...@@ -278,6 +278,7 @@ export default { ...@@ -278,6 +278,7 @@ export default {
278 value: "preNo", 278 value: "preNo",
279 width: "", 279 width: "",
280 align: "left", 280 align: "left",
281 + slot: true,
281 }, 282 },
282 { 283 {
283 name: "提运单号", 284 name: "提运单号",
...@@ -317,7 +318,7 @@ export default { ...@@ -317,7 +318,7 @@ export default {
317 }, 318 },
318 { 319 {
319 name: "汇总时间", 320 name: "汇总时间",
320 - value: "startTime"+"~"+"endTime", 321 + value: "startTime",
321 width: "", 322 width: "",
322 align: "left", 323 align: "left",
323 }, 324 },
...@@ -433,7 +434,6 @@ export default { ...@@ -433,7 +434,6 @@ export default {
433 this.receiptApi(val.data.copNo, val.status) 434 this.receiptApi(val.data.copNo, val.status)
434 .then((res) => { 435 .then((res) => {
435 val.tableData.forEach((item) => { 436 val.tableData.forEach((item) => {
436 - console.log("item",item)
437 if (item.id == val.data.id) { 437 if (item.id == val.data.id) {
438 item.popoverData = res; 438 item.popoverData = res;
439 } 439 }
...@@ -442,6 +442,7 @@ export default { ...@@ -442,6 +442,7 @@ export default {
442 }) 442 })
443 .finally(() => { 443 .finally(() => {
444 this.$nextTick(() => { 444 this.$nextTick(() => {
445 + this.$store.dispatch('setLoadingState', false)
445 this.$refs.returnStatusPopover.tableLoading = false; 446 this.$refs.returnStatusPopover.tableLoading = false;
446 }); 447 });
447 }); 448 });
......