Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
6a82cec2 1 parent 5f942ddb

待测试功能代码增加

Inline Side-by-side
Showing 8 changed files with 1079 additions and 211 deletions
1 +import request from '@/utils/request'
2 +
3 +// DM数据查询
4 +/**
5 + * @param createTime 创建时间 *
6 + * @param fltNo 航班号
7 + * @param fltDate 航班日期
8 + * @param status 状态
9 + * @param portName 口岸名称
10 + * @param page 页数 *
11 + * @param size 数据长度
12 + */
13 +export function getDmDataList(data) {
14 + return request({
15 + url: '/dmDataLog/getDmDataList',
16 + method: 'post',
17 + data: data
18 + })
19 +}
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650528704724" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2035" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
2 +</style></defs><path d="M396.00128 892.68224c-130.6624-16.62976-247.6032-63.52896-247.6032-122.38336V692.8384c51.48672 38.62528 131.8912 66.23232 225.64864 79.33952 0.4096-20.84864 2.8672-41.21088 7.24992-60.87168-124.60032-18.14528-232.89856-63.7696-232.89856-120.34048v-77.45536c61.80864 46.36672 165.0688 77.08672 283.4432 85.44256a310.12864 310.12864 0 0 1 54.84544-58.61376c-161.792-2.176-338.28864-56.44288-338.28864-128.77824V354.05824C221.30688 408.69888 351.55968 442.04032 496.64 442.04032c145.03936 0 275.328-33.30048 348.24192-87.98208v57.50784c0 28.22144-27.02848 53.69856-69.4272 74.42432a307.38944 307.38944 0 0 1 65.29024 30.22848c1.26976-0.94208 2.8672-1.76128 4.1728-2.70336v5.24288a307.26144 307.26144 0 0 1 60.87168 50.5856V252.1088c0-108.25728-175.88224-189.89056-409.10848-189.89056s-409.1904 81.63328-409.1904 189.89056v518.18496c0 98.01728 144.26112 173.95712 344.55552 187.51488a306.62144 306.62144 0 0 1-36.0448-65.1264zM496.64 123.12576c164.40832 0 348.24192 55.17312 348.24192 128.98304S661.04832 381.09184 496.64 381.09184c-164.37248 0-348.20096-55.17312-348.20096-128.98304S332.26752 123.12576 496.64 123.12576z" p-id="2036"></path><path d="M731.4176 907.264l-95.0272-72.25344h-11.1872c-5.57056 0-5.57056 5.61152-5.57056 11.10016v38.87104c-39.15264-22.20032-67.09248-61.07136-72.65792-105.50784 0-11.10016-16.7936-22.24128-27.97568-22.24128-11.18208 0-22.36416 16.74752-22.36416 27.84768 5.61152 44.4416 27.97568 83.30752 55.9104 111.08352 22.36416 16.62976 44.72832 33.30048 67.09248 44.4416v44.44672c0 5.5296 0 5.5296 5.57056 5.5296 5.61664 5.61152 5.61664 5.61152 11.1872 5.61152l95.0272-72.25344s5.61664-5.5296 5.61664-11.10016c-0.00512-0.04608-0.00512-5.57568-5.62176-5.57568z m162.16064-183.25504l39.12192-22.24128c5.61152 0 5.61152-5.57056 5.61152-11.10016s0-5.5296-5.61152-11.10016l-111.8208-44.40064h-11.14112c-5.57056 0-5.57056 5.52448-5.57056 5.52448l-5.61664 122.22464c0 5.5296 0 5.5296 5.61664 5.5296h11.14112l33.54624-22.20032c0 44.4416-16.7936 88.84224-55.9104 116.65408-11.1872 11.10016-11.1872 22.20032-5.61664 33.30048 11.1872 11.10016 22.36928 11.10016 33.5104 0 55.95136-33.37728 83.97312-105.5488 72.73984-172.19072z m-234.7776-72.25344c0-5.5296 0-5.5296-5.61152-11.10016l-33.55136-16.62976c39.15776-22.20032 83.8912-27.77088 128.61952-11.10016 11.14112 5.61664 27.9296 0 33.50016-16.62976 5.61664-11.10016 0-27.77088-16.74752-33.30048-61.48096-22.20032-139.8016-5.57056-190.09536 33.30048l-44.72832-22.24128h-11.18208c0 5.61152-5.57056 5.61152 0 11.10016l11.18208 116.65408s0 5.57056 5.61664 5.57056h11.18208l111.8208-50.01216v-5.61152h-0.00512z" p-id="2037"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
...@@ -21,13 +21,13 @@ let ductLabels = { ...@@ -21,13 +21,13 @@ let ductLabels = {
21 }, 21 },
22 "role": {//角色设置 22 "role": {//角色设置
23 "valid": { 23 "valid": {
24 - "1": "开启", 24 + "1": "启用",
25 "2": "关闭", 25 "2": "关闭",
26 }, 26 },
27 }, 27 },
28 "user": {//用户设置 28 "user": {//用户设置
29 "isValid": { 29 "isValid": {
30 - "1": "开启", 30 + "1": "启用",
31 "2": "关闭", 31 "2": "关闭",
32 }, 32 },
33 }, 33 },
...@@ -55,6 +55,9 @@ let ductLabels = { ...@@ -55,6 +55,9 @@ let ductLabels = {
55 "1": "已处理", 55 "1": "已处理",
56 "2": "处理失败", 56 "2": "处理失败",
57 "3": "无需处理", 57 "3": "无需处理",
58 + "4": "校验不通过",
59 + "5": "数据不能被多次处理",
60 + "9": "处理中",
58 }, 61 },
59 } 62 }
60 } 63 }
......
...@@ -89,8 +89,8 @@ export const constantRoutes = [ ...@@ -89,8 +89,8 @@ export const constantRoutes = [
89 ] 89 ]
90 90
91 export default new Router({ 91 export default new Router({
92 - mode: 'history', // 去掉url中的# 92 + mode: 'hash', // 去掉url中的#
93 scrollBehavior: () => ({ y: 0 }), 93 scrollBehavior: () => ({ y: 0 }),
94 routes: constantRoutes, 94 routes: constantRoutes,
95 - base: '/iMac' 95 + base: '/test'
96 }) 96 })
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 </el-select> 72 </el-select>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 - <!-- <el-col :span="6"> 75 + <el-col :span="6">
76 <el-form-item label="ACCSpool"> 76 <el-form-item label="ACCSpool">
77 <el-select 77 <el-select
78 placeholder="不限" 78 placeholder="不限"
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 </el-option> 97 </el-option>
98 </el-select> 98 </el-select>
99 </el-form-item> 99 </el-form-item>
100 - </el-col> --> 100 + </el-col>
101 <el-col :span="6"> 101 <el-col :span="6">
102 <el-form-item label="运单号"> 102 <el-form-item label="运单号">
103 <el-input 103 <el-input
...@@ -181,6 +181,7 @@ ...@@ -181,6 +181,7 @@
181 :controls="false" 181 :controls="false"
182 :min="0" 182 :min="0"
183 :precision="2" 183 :precision="2"
184 + clearable
184 ></el-input-number 185 ></el-input-number
185 ></el-col> 186 ></el-col>
186 <el-col class="line" :span="2">-</el-col> 187 <el-col class="line" :span="2">-</el-col>
...@@ -192,6 +193,7 @@ ...@@ -192,6 +193,7 @@
192 :controls="false" 193 :controls="false"
193 :min="formData.minWeight" 194 :min="formData.minWeight"
194 :precision="2" 195 :precision="2"
196 + clearable
195 ></el-input-number 197 ></el-input-number
196 ></el-col> 198 ></el-col>
197 </el-row> 199 </el-row>
...@@ -207,6 +209,7 @@ ...@@ -207,6 +209,7 @@
207 v-model="formData.minNumber" 209 v-model="formData.minNumber"
208 :controls="false" 210 :controls="false"
209 :min="0" 211 :min="0"
212 + clearable
210 ></el-input-number 213 ></el-input-number
211 ></el-col> 214 ></el-col>
212 <el-col class="line" :span="2">-</el-col> 215 <el-col class="line" :span="2">-</el-col>
...@@ -217,6 +220,7 @@ ...@@ -217,6 +220,7 @@
217 v-model="formData.maxNumber" 220 v-model="formData.maxNumber"
218 :controls="false" 221 :controls="false"
219 :min="formData.minNumber" 222 :min="formData.minNumber"
223 + clearable
220 ></el-input-number 224 ></el-input-number
221 ></el-col> 225 ></el-col>
222 </el-row> 226 </el-row>
...@@ -308,7 +312,7 @@ ...@@ -308,7 +312,7 @@
308 size="mini" 312 size="mini"
309 v-hasPermi="['allocation:cargo:allocation']" 313 v-hasPermi="['allocation:cargo:allocation']"
310 @click="addFit" 314 @click="addFit"
311 - :disabled="tableSelection.length <= 0 || formData.accsPool!='OSPR'" 315 + :disabled="tableSelection.length <= 0"
312 >添加到航班</el-button 316 >添加到航班</el-button
313 > 317 >
314 <div class="tips"> 318 <div class="tips">
...@@ -319,16 +323,20 @@ ...@@ -319,16 +323,20 @@
319 </el-form> 323 </el-form>
320 <Tables 324 <Tables
321 ref="newTables" 325 ref="newTables"
326 + ductName="cargo"
322 :data="tableData" 327 :data="tableData"
323 :headerData="tableHeader" 328 :headerData="tableHeader"
324 :totalCount="totalCount" 329 :totalCount="totalCount"
325 :loading="loading" 330 :loading="loading"
331 + :selection="true"
326 :limitSize="size" 332 :limitSize="size"
327 :limitStart="formData.limitStart" 333 :limitStart="formData.limitStart"
328 :page="page" 334 :page="page"
329 :shiftKey="shiftKey" 335 :shiftKey="shiftKey"
330 :infoShow="false" 336 :infoShow="false"
331 :height="tableHeight" 337 :height="tableHeight"
338 + :pageSizes="[100]"
339 + @sizeChange="sizeChange"
332 @tableSelect="tableSelect" 340 @tableSelect="tableSelect"
333 @tableSelectAll="tableSelectAll" 341 @tableSelectAll="tableSelectAll"
334 @currentChange="currentChange" 342 @currentChange="currentChange"
...@@ -376,31 +384,10 @@ export default { ...@@ -376,31 +384,10 @@ export default {
376 handingCodes: null, 384 handingCodes: null,
377 subCategorys: null, 385 subCategorys: null,
378 customsReceiptStatusId: null, 386 customsReceiptStatusId: null,
379 - // accsPool:"OSPR" 387 + accsPool:"OSPR"
380 }, //查询数据 388 }, //查询数据
381 tableHeader: [ 389 tableHeader: [
382 { 390 {
383 - type: "selection",
384 - name: "",
385 - value: "",
386 - width: "50",
387 - align: "center",
388 - sorTable: false,
389 - fixed: true,
390 - disabled:true
391 - },
392 - {
393 - type: "index",
394 - name: "",
395 - value: "",
396 - width: "50",
397 - align: "center",
398 - sorTable: false,
399 - fixed: false,
400 - disabled:true
401 - },
402 - {
403 - type: "",
404 name: "口岸代码", 391 name: "口岸代码",
405 value: "portName", 392 value: "portName",
406 width: "100", 393 width: "100",
...@@ -410,7 +397,6 @@ export default { ...@@ -410,7 +397,6 @@ export default {
410 disabled:true 397 disabled:true
411 }, 398 },
412 { 399 {
413 - type: "",
414 name: "取件日期", 400 name: "取件日期",
415 value: "pickUpDate", 401 value: "pickUpDate",
416 width: "120", 402 width: "120",
...@@ -420,7 +406,6 @@ export default { ...@@ -420,7 +406,6 @@ export default {
420 disabled:true 406 disabled:true
421 }, 407 },
422 { 408 {
423 - type: "",
424 name: "取件扫描号", 409 name: "取件扫描号",
425 value: "pickUpScanNo", 410 value: "pickUpScanNo",
426 width: "120", 411 width: "120",
...@@ -430,7 +415,6 @@ export default { ...@@ -430,7 +415,6 @@ export default {
430 disabled:true 415 disabled:true
431 }, 416 },
432 { 417 {
433 - type: "",
434 name: "站点", 418 name: "站点",
435 value: "siteName", 419 value: "siteName",
436 width: "80", 420 width: "80",
...@@ -440,7 +424,6 @@ export default { ...@@ -440,7 +424,6 @@ export default {
440 disabled:true 424 disabled:true
441 }, 425 },
442 { 426 {
443 - type: "",
444 name: "运单号", 427 name: "运单号",
445 value: "waybillNo", 428 value: "waybillNo",
446 width: "120", 429 width: "120",
...@@ -450,7 +433,6 @@ export default { ...@@ -450,7 +433,6 @@ export default {
450 disabled:true 433 disabled:true
451 }, 434 },
452 { 435 {
453 - type: "",
454 name: "总单号", 436 name: "总单号",
455 value: "totalWaybillNo", 437 value: "totalWaybillNo",
456 width: "120", 438 width: "120",
...@@ -460,7 +442,6 @@ export default { ...@@ -460,7 +442,6 @@ export default {
460 disabled:true 442 disabled:true
461 }, 443 },
462 { 444 {
463 - type: "",
464 name: "服务类型", 445 name: "服务类型",
465 value: "serviceTypeName", 446 value: "serviceTypeName",
466 width: "100", 447 width: "100",
...@@ -470,7 +451,6 @@ export default { ...@@ -470,7 +451,6 @@ export default {
470 disabled:true 451 disabled:true
471 }, 452 },
472 { 453 {
473 - type: "",
474 name: "服务代码", 454 name: "服务代码",
475 value: "serviceCode", 455 value: "serviceCode",
476 width: "100", 456 width: "100",
...@@ -480,7 +460,6 @@ export default { ...@@ -480,7 +460,6 @@ export default {
480 disabled:true 460 disabled:true
481 }, 461 },
482 { 462 {
483 - type: "",
484 name: "URSA", 463 name: "URSA",
485 value: "ursa", 464 value: "ursa",
486 width: "100", 465 width: "100",
...@@ -490,7 +469,6 @@ export default { ...@@ -490,7 +469,6 @@ export default {
490 disabled:true 469 disabled:true
491 }, 470 },
492 { 471 {
493 - type: "",
494 name: "申报类型", 472 name: "申报类型",
495 value: "typeName", 473 value: "typeName",
496 width: "100", 474 width: "100",
...@@ -500,7 +478,6 @@ export default { ...@@ -500,7 +478,6 @@ export default {
500 disabled:true 478 disabled:true
501 }, 479 },
502 { 480 {
503 - type: "",
504 name: "HandlingCode", 481 name: "HandlingCode",
505 value: "handingCode", 482 value: "handingCode",
506 width: "150", 483 width: "150",
...@@ -510,7 +487,6 @@ export default { ...@@ -510,7 +487,6 @@ export default {
510 disabled:true 487 disabled:true
511 }, 488 },
512 { 489 {
513 - type: "",
514 name: "subcategory", 490 name: "subcategory",
515 value: "subCategory", 491 value: "subCategory",
516 width: "140", 492 width: "140",
...@@ -520,7 +496,6 @@ export default { ...@@ -520,7 +496,6 @@ export default {
520 disabled:true 496 disabled:true
521 }, 497 },
522 { 498 {
523 - type: "",
524 name: "件数", 499 name: "件数",
525 value: "qty", 500 value: "qty",
526 width: "80", 501 width: "80",
...@@ -530,7 +505,6 @@ export default { ...@@ -530,7 +505,6 @@ export default {
530 disabled:true 505 disabled:true
531 }, 506 },
532 { 507 {
533 - type: "",
534 name: "实际重量", 508 name: "实际重量",
535 value: "actualWeight", 509 value: "actualWeight",
536 width: "100", 510 width: "100",
...@@ -540,7 +514,6 @@ export default { ...@@ -540,7 +514,6 @@ export default {
540 disabled:true 514 disabled:true
541 }, 515 },
542 { 516 {
543 - type: "",
544 name: "收件人国家代码", 517 name: "收件人国家代码",
545 value: "consigneeCountry", 518 value: "consigneeCountry",
546 width: "150", 519 width: "150",
...@@ -550,7 +523,6 @@ export default { ...@@ -550,7 +523,6 @@ export default {
550 disabled:true 523 disabled:true
551 }, 524 },
552 { 525 {
553 - type: "",
554 name: "品名描述", 526 name: "品名描述",
555 value: "nameDescription", 527 value: "nameDescription",
556 width: "100", 528 width: "100",
...@@ -560,7 +532,6 @@ export default { ...@@ -560,7 +532,6 @@ export default {
560 disabled:true 532 disabled:true
561 }, 533 },
562 { 534 {
563 - type: "",
564 name: "海关回执状态", 535 name: "海关回执状态",
565 value: "customsReceiptStatusName", 536 value: "customsReceiptStatusName",
566 width: "140", 537 width: "140",
...@@ -570,7 +541,6 @@ export default { ...@@ -570,7 +541,6 @@ export default {
570 disabled:true 541 disabled:true
571 }, 542 },
572 { 543 {
573 - type: "",
574 name: "预审状态", 544 name: "预审状态",
575 value: "preQualificationStatus", 545 value: "preQualificationStatus",
576 width: "100", 546 width: "100",
...@@ -580,7 +550,6 @@ export default { ...@@ -580,7 +550,6 @@ export default {
580 disabled:true 550 disabled:true
581 }, 551 },
582 { 552 {
583 - type: "",
584 name: "航班预审意见", 553 name: "航班预审意见",
585 value: "caPretrialOpinion", 554 value: "caPretrialOpinion",
586 width: "120", 555 width: "120",
...@@ -590,7 +559,6 @@ export default { ...@@ -590,7 +559,6 @@ export default {
590 disabled:true 559 disabled:true
591 }, 560 },
592 { 561 {
593 - type: "",
594 name: "货物状态", 562 name: "货物状态",
595 value: "statusName", 563 value: "statusName",
596 width: "100", 564 width: "100",
...@@ -600,7 +568,6 @@ export default { ...@@ -600,7 +568,6 @@ export default {
600 disabled:true 568 disabled:true
601 }, 569 },
602 { 570 {
603 - type: "",
604 name: "终配航班号", 571 name: "终配航班号",
605 value: "finalFlightNo", 572 value: "finalFlightNo",
606 width: "120", 573 width: "120",
...@@ -610,7 +577,6 @@ export default { ...@@ -610,7 +577,6 @@ export default {
610 disabled:true 577 disabled:true
611 }, 578 },
612 { 579 {
613 - type: "",
614 name: "终配航班日期", 580 name: "终配航班日期",
615 value: "finalFlightTime", 581 value: "finalFlightTime",
616 width: "140", 582 width: "140",
...@@ -620,7 +586,6 @@ export default { ...@@ -620,7 +586,6 @@ export default {
620 disabled:true 586 disabled:true
621 }, 587 },
622 { 588 {
623 - type: "",
624 name: "二配航班号", 589 name: "二配航班号",
625 value: "twoMatchFlightNo", 590 value: "twoMatchFlightNo",
626 width: "120", 591 width: "120",
...@@ -630,7 +595,6 @@ export default { ...@@ -630,7 +595,6 @@ export default {
630 disabled:true 595 disabled:true
631 }, 596 },
632 { 597 {
633 - type: "",
634 name: "二配航班日期", 598 name: "二配航班日期",
635 value: "twoMatchFlightTime", 599 value: "twoMatchFlightTime",
636 width: "150", 600 width: "150",
...@@ -640,7 +604,6 @@ export default { ...@@ -640,7 +604,6 @@ export default {
640 disabled:true 604 disabled:true
641 }, 605 },
642 { 606 {
643 - type: "",
644 name: "预配航班号", 607 name: "预配航班号",
645 value: "preplanFlightNo", 608 value: "preplanFlightNo",
646 width: "120", 609 width: "120",
...@@ -650,7 +613,6 @@ export default { ...@@ -650,7 +613,6 @@ export default {
650 disabled:true 613 disabled:true
651 }, 614 },
652 { 615 {
653 - type: "",
654 name: "预配航班日期", 616 name: "预配航班日期",
655 value: "preplanFlightTime", 617 value: "preplanFlightTime",
656 width: "150", 618 width: "150",
...@@ -660,7 +622,6 @@ export default { ...@@ -660,7 +622,6 @@ export default {
660 disabled:true 622 disabled:true
661 }, 623 },
662 { 624 {
663 - type: "",
664 name: "ACCS原航班号", 625 name: "ACCS原航班号",
665 value: "fltNoAccs", 626 value: "fltNoAccs",
666 width: "150", 627 width: "150",
...@@ -670,7 +631,6 @@ export default { ...@@ -670,7 +631,6 @@ export default {
670 disabled:true 631 disabled:true
671 }, 632 },
672 { 633 {
673 - type: "",
674 name: "ACCS原航班日期", 634 name: "ACCS原航班日期",
675 value: "fltDateAccs", 635 value: "fltDateAccs",
676 width: "150", 636 width: "150",
...@@ -680,7 +640,6 @@ export default { ...@@ -680,7 +640,6 @@ export default {
680 disabled:true 640 disabled:true
681 }, 641 },
682 { 642 {
683 - type: "",
684 name: "ACCS原航线", 643 name: "ACCS原航线",
685 value: "accsFlightRoute", 644 value: "accsFlightRoute",
686 width: "140", 645 width: "140",
...@@ -690,7 +649,6 @@ export default { ...@@ -690,7 +649,6 @@ export default {
690 disabled:true 649 disabled:true
691 }, 650 },
692 { 651 {
693 - type: "",
694 name: "是否RDE手工录入", 652 name: "是否RDE手工录入",
695 value: "manualRde", 653 value: "manualRde",
696 width: "170", 654 width: "170",
...@@ -700,7 +658,6 @@ export default { ...@@ -700,7 +658,6 @@ export default {
700 disabled:true 658 disabled:true
701 }, 659 },
702 { 660 {
703 - type: "",
704 name: "是否自动", 661 name: "是否自动",
705 value: "cargoRulesStatus", 662 value: "cargoRulesStatus",
706 width: "100", 663 width: "100",
...@@ -710,7 +667,6 @@ export default { ...@@ -710,7 +667,6 @@ export default {
710 disabled:true 667 disabled:true
711 }, 668 },
712 { 669 {
713 - type: "",
714 name: "发件人账号", 670 name: "发件人账号",
715 value: "shipperAccount", 671 value: "shipperAccount",
716 width: "120", 672 width: "120",
...@@ -720,7 +676,6 @@ export default { ...@@ -720,7 +676,6 @@ export default {
720 disabled:true 676 disabled:true
721 }, 677 },
722 { 678 {
723 - type: "",
724 name: "发件公司中文名称", 679 name: "发件公司中文名称",
725 value: "shipperCompany", 680 value: "shipperCompany",
726 width: "150", 681 width: "150",
...@@ -730,7 +685,6 @@ export default { ...@@ -730,7 +685,6 @@ export default {
730 disabled:true 685 disabled:true
731 }, 686 },
732 { 687 {
733 - type: "",
734 name: "始发地城市名称", 688 name: "始发地城市名称",
735 value: "originCity", 689 value: "originCity",
736 width: "130", 690 width: "130",
...@@ -740,7 +694,6 @@ export default { ...@@ -740,7 +694,6 @@ export default {
740 disabled:true 694 disabled:true
741 }, 695 },
742 { 696 {
743 - type: "",
744 name: "收件地", 697 name: "收件地",
745 value: "destinationSiteName", 698 value: "destinationSiteName",
746 width: "90", 699 width: "90",
...@@ -750,7 +703,6 @@ export default { ...@@ -750,7 +703,6 @@ export default {
750 disabled:true 703 disabled:true
751 }, 704 },
752 { 705 {
753 - type: "",
754 name: "尺寸", 706 name: "尺寸",
755 value: "sizeStr", 707 value: "sizeStr",
756 width: "80", 708 width: "80",
...@@ -760,7 +712,6 @@ export default { ...@@ -760,7 +712,6 @@ export default {
760 disabled:true 712 disabled:true
761 }, 713 },
762 { 714 {
763 - type: "",
764 name: "大货预审意见（是否可以配置航班）", 715 name: "大货预审意见（是否可以配置航班）",
765 value: "bigPretrialOpinion", 716 value: "bigPretrialOpinion",
766 width: "250", 717 width: "250",
...@@ -770,7 +721,6 @@ export default { ...@@ -770,7 +721,6 @@ export default {
770 disabled:true 721 disabled:true
771 }, 722 },
772 { 723 {
773 - type: "",
774 name: "大货预审时间", 724 name: "大货预审时间",
775 value: "bigPretrialTime", 725 value: "bigPretrialTime",
776 width: "120", 726 width: "120",
...@@ -780,7 +730,6 @@ export default { ...@@ -780,7 +730,6 @@ export default {
780 disabled:true 730 disabled:true
781 }, 731 },
782 { 732 {
783 - type: "",
784 name: "海关回执时间", 733 name: "海关回执时间",
785 value: "customsReceiptTime", 734 value: "customsReceiptTime",
786 width: "150", 735 width: "150",
...@@ -790,7 +739,6 @@ export default { ...@@ -790,7 +739,6 @@ export default {
790 disabled:true 739 disabled:true
791 }, 740 },
792 { 741 {
793 - type: "",
794 name: "航班预审时间", 742 name: "航班预审时间",
795 value: "caPretrialTime", 743 value: "caPretrialTime",
796 width: "150", 744 width: "150",
...@@ -800,7 +748,6 @@ export default { ...@@ -800,7 +748,6 @@ export default {
800 disabled:true 748 disabled:true
801 }, 749 },
802 { 750 {
803 - type: "",
804 name: "创建人", 751 name: "创建人",
805 value: "createUserName", 752 value: "createUserName",
806 width: "90", 753 width: "90",
...@@ -810,7 +757,6 @@ export default { ...@@ -810,7 +757,6 @@ export default {
810 disabled:true 757 disabled:true
811 }, 758 },
812 { 759 {
813 - type: "",
814 name: "创建时间", 760 name: "创建时间",
815 value: "createTime", 761 value: "createTime",
816 width: "100", 762 width: "100",
...@@ -859,6 +805,9 @@ export default { ...@@ -859,6 +805,9 @@ export default {
859 activated(){ 805 activated(){
860 this.select(); 806 this.select();
861 }, 807 },
808 + deactivated(){
809 + this.tableData = []
810 + },
862 mounted() { 811 mounted() {
863 window.addEventListener("keydown", (code) => { 812 window.addEventListener("keydown", (code) => {
864 if (code.keyCode === 16 && code.shiftKey) { 813 if (code.keyCode === 16 && code.shiftKey) {
...@@ -1118,9 +1067,6 @@ export default { ...@@ -1118,9 +1067,6 @@ export default {
1118 }, 1067 },
1119 }, 1068 },
1120 }, 1069 },
1121 - deactivated(){
1122 - this.tableData = []
1123 - },
1124 }; 1070 };
1125 </script> 1071 </script>
1126 1072
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 size="small" 8 size="small"
9 :model="formData" 9 :model="formData"
10 > 10 >
11 - <el-row type="flex" style="flexWrap: wrap!important"> 11 + <el-row type="flex" style="flexWrap: wrap !important">
12 <el-col :span="6"> 12 <el-col :span="6">
13 <el-form-item label="配舱航班日期"> 13 <el-form-item label="配舱航班日期">
14 <el-date-picker 14 <el-date-picker
...@@ -19,13 +19,21 @@ ...@@ -19,13 +19,21 @@
19 start-placeholder="开始日期" 19 start-placeholder="开始日期"
20 end-placeholder="结束日期" 20 end-placeholder="结束日期"
21 :value-format="valueFormat" 21 :value-format="valueFormat"
22 + clearable
22 > 23 >
23 </el-date-picker> 24 </el-date-picker>
24 </el-form-item> 25 </el-form-item>
25 </el-col> 26 </el-col>
26 <el-col :span="6"> 27 <el-col :span="6">
27 <el-form-item label="配载航班号"> 28 <el-form-item label="配载航班号">
28 - <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"></el-input> 29 + <el-input
30 + type="textarea"
31 + v-model="cargoPlaneNo"
32 + class="formItem"
33 + placeholder="AC001;AC002"
34 + :autosize="true"
35 + clearable
36 + ></el-input>
29 </el-form-item> 37 </el-form-item>
30 </el-col> 38 </el-col>
31 <el-col :span="6"> 39 <el-col :span="6">
...@@ -55,27 +63,28 @@ ...@@ -55,27 +63,28 @@
55 class="formItem" 63 class="formItem"
56 placeholder="请输入运单号（回车间隔）" 64 placeholder="请输入运单号（回车间隔）"
57 :autosize="true" 65 :autosize="true"
66 + clearable
58 ></el-input> 67 ></el-input>
59 </el-form-item> 68 </el-form-item>
60 </el-col> 69 </el-col>
61 <el-col :span="6"> 70 <el-col :span="6">
62 <el-form-item label="申报类别"> 71 <el-form-item label="申报类别">
63 - <el-select 72 + <el-select
64 - placeholder="不限" 73 + placeholder="不限"
65 - v-model="formData.typeId" 74 + v-model="formData.typeId"
66 - class="formItem" 75 + class="formItem"
67 - clearable 76 + clearable
68 - >
69 - <el-option
70 - v-for="item in findConditionData.cargoType"
71 - :label="item.chineseName"
72 - :value="item.id"
73 - :key="item.id"
74 > 77 >
75 - </el-option> 78 + <el-option
76 - </el-select> 79 + v-for="item in findConditionData.cargoType"
80 + :label="item.chineseName"
81 + :value="item.id"
82 + :key="item.id"
83 + >
84 + </el-option>
85 + </el-select>
77 </el-form-item> 86 </el-form-item>
78 - </el-col> 87 + </el-col>
79 <el-col :span="6"> 88 <el-col :span="6">
80 <el-form-item label="服务类型"> 89 <el-form-item label="服务类型">
81 <el-select 90 <el-select
...@@ -103,6 +112,7 @@ ...@@ -103,6 +112,7 @@
103 class="formItem" 112 class="formItem"
104 placeholder="S_;P_;E2" 113 placeholder="S_;P_;E2"
105 :autosize="true" 114 :autosize="true"
115 + clearable
106 ></el-input> 116 ></el-input>
107 </el-form-item> 117 </el-form-item>
108 </el-col> 118 </el-col>
...@@ -114,11 +124,12 @@ ...@@ -114,11 +124,12 @@
114 class="formItem" 124 class="formItem"
115 placeholder="PVG;PEK" 125 placeholder="PVG;PEK"
116 :autosize="true" 126 :autosize="true"
127 + clearable
117 ></el-input> 128 ></el-input>
118 </el-form-item> 129 </el-form-item>
119 </el-col> 130 </el-col>
120 - <el-col :span="24" v-show="formShow"> 131 + <el-col v-show="formShow">
121 - <el-row type="flex" style="flexWrap: wrap!important"> 132 + <el-row type="flex" style="flexWrap: wrap !important">
122 <el-col :span="6"> 133 <el-col :span="6">
123 <el-form-item label="ACCS原航班日期"> 134 <el-form-item label="ACCS原航班日期">
124 <el-date-picker 135 <el-date-picker
...@@ -129,22 +140,31 @@ ...@@ -129,22 +140,31 @@
129 start-placeholder="开始日期" 140 start-placeholder="开始日期"
130 end-placeholder="结束日期" 141 end-placeholder="结束日期"
131 :value-format="valueFormat" 142 :value-format="valueFormat"
143 + clearable
132 > 144 >
133 </el-date-picker> 145 </el-date-picker>
134 - </el-form-item> 146 + </el-form-item>
135 </el-col> 147 </el-col>
136 <el-col :span="6"> 148 <el-col :span="6">
137 <el-form-item label="ACCS原航班号"> 149 <el-form-item label="ACCS原航班号">
138 - <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input> 150 + <el-input
151 + type="text"
152 + v-model="fltNo"
153 + class="formItem"
154 + placeholder="请输入ACCS航班号"
155 + clearable
156 + ></el-input>
139 </el-form-item> 157 </el-form-item>
140 </el-col> 158 </el-col>
141 <el-col :span="6"> 159 <el-col :span="6">
142 <el-form-item label="取件日期"> 160 <el-form-item label="取件日期">
143 <el-date-picker 161 <el-date-picker
162 + class="formItem"
144 v-model="formData.pickUpDate" 163 v-model="formData.pickUpDate"
145 type="date" 164 type="date"
146 placeholder="选择日期" 165 placeholder="选择日期"
147 :value-format="valueFormat" 166 :value-format="valueFormat"
167 + clearable
148 > 168 >
149 </el-date-picker> 169 </el-date-picker>
150 </el-form-item> 170 </el-form-item>
...@@ -159,11 +179,38 @@ ...@@ -159,11 +179,38 @@
159 start-placeholder="开始日期" 179 start-placeholder="开始日期"
160 end-placeholder="结束日期" 180 end-placeholder="结束日期"
161 :value-format="valueFormat" 181 :value-format="valueFormat"
182 + clearable
162 > 183 >
163 </el-date-picker> 184 </el-date-picker>
164 </el-form-item> 185 </el-form-item>
165 </el-col> 186 </el-col>
166 <el-col :span="6"> 187 <el-col :span="6">
188 + <el-form-item label="ACCSpool">
189 + <el-select
190 + placeholder="不限"
191 + v-model="formData.accsPool"
192 + class="formItem"
193 + clearable
194 + >
195 + <el-option
196 + value="Pre-MDE"
197 + key="Pre-MDE"
198 + >
199 + </el-option>
200 + <el-option
201 + value="OSPR"
202 + key="OSPR"
203 + >
204 + </el-option>
205 + <el-option
206 + value="Manifest"
207 + key="Manifest"
208 + >
209 + </el-option>
210 + </el-select>
211 + </el-form-item>
212 + </el-col>
213 + <el-col :span="6">
167 <el-form-item label="货物状态"> 214 <el-form-item label="货物状态">
168 <el-select 215 <el-select
169 placeholder="不限" 216 placeholder="不限"
...@@ -190,23 +237,15 @@ ...@@ -190,23 +237,15 @@
190 class="formItem" 237 class="formItem"
191 clearable 238 clearable
192 > 239 >
193 - <el-option 240 + <el-option label="手动" value="1"> </el-option>
194 - label="手动" 241 + <el-option label="自动" value="2"> </el-option>
195 - value="1"
196 - >
197 - </el-option>
198 - <el-option
199 - label="自动"
200 - value="2"
201 - >
202 - </el-option>
203 </el-select> 242 </el-select>
204 </el-form-item> 243 </el-form-item>
205 </el-col> 244 </el-col>
206 </el-row> 245 </el-row>
207 </el-col> 246 </el-col>
208 </el-row> 247 </el-row>
209 - <div style="paddingLeft: 10px;marginTop:20px"> 248 + <div style="paddingLeft: 10px; marginTop: 20px">
210 <el-button 249 <el-button
211 type="primary" 250 type="primary"
212 icon="el-icon-search" 251 icon="el-icon-search"
...@@ -215,19 +254,55 @@ ...@@ -215,19 +254,55 @@
215 @click="select(0)" 254 @click="select(0)"
216 >查询</el-button 255 >查询</el-button
217 > 256 >
218 - <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" v-hasPermi="['base:cargo:export']" 257 + <el-button
219 - >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button 258 + v-hasPermi="['base:cargo:export']"
259 + :type="downLoadingTip.downloading ? 'warning' : 'primary'"
260 + size="small"
261 + @click="xlse(0)"
262 + :disabled="tableData.length == 0"
263 + :loading="downLoadingTip.downloading"
264 + >{{
265 + downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
266 + }}</el-button
267 + >
268 + <el-button
269 + v-hasPermi="['base:cargo:export']"
270 + :type="downLoadingTip.downloading ? 'warning' : 'primary'"
271 + size="small"
272 + @click="xlse(1)"
273 + :disabled="tableData.length == 0"
274 + :loading="downLoadingTip.downloading"
275 + >{{
276 + downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
277 + }}</el-button
278 + >
279 + <el-button
280 + type="primary"
281 + size="small"
282 + :disabled="selectTable.length==0"
283 + v-hasPermi="['base:cargo:export']"
284 + @click="release"
285 + >释放舱位</el-button
220 > 286 >
221 - <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" v-hasPermi="['base:cargo:export']" 287 + <span style="marginLeft: 20px; color: #ffba00"
222 - >{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button 288 + >全部导出上限80000条数据</span
223 > 289 >
224 - <span style="marginLeft:20px;color:#ffba00">全部导出上限80000条数据</span> 290 + <el-progress
225 - <el-progress v-if="progress!=0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress" :status="progress == 100?'success':'warning'"></el-progress> 291 + v-if="progress != 0"
292 + class="progress"
293 + :stroke-width="12"
294 + :show-text="true"
295 + :percentage="progress"
296 + :status="progress == 100 ? 'success' : 'warning'"
297 + ></el-progress>
226 <div class="tips"> 298 <div class="tips">
227 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 299 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
228 <span>总件数:{{ allQty }}</span> 300 <span>总件数:{{ allQty }}</span>
229 </div> 301 </div>
230 - <div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div> 302 + <div class="formShow" @click="formShow = !formShow">
303 + <i class="el-icon-s-tools"></i
304 + >{{ formShow ? "收起条件" : "更多条件" }}
305 + </div>
231 </div> 306 </div>
232 </el-form> 307 </el-form>
233 <Tables 308 <Tables
...@@ -252,16 +327,49 @@ ...@@ -252,16 +327,49 @@
252 @currentChange="currentChange" 327 @currentChange="currentChange"
253 @sortChange="sortChange" 328 @sortChange="sortChange"
254 ></Tables> 329 ></Tables>
330 + <el-dialog
331 + title="舱位释放结果"
332 + width="80%"
333 + :visible.sync="dialogVisible"
334 + :close-on-click-modal="false"
335 + :show-close="false"
336 + :append-to-body="true"
337 + >
338 + <el-table
339 + :data="selectTable"
340 + size="mini"
341 + border
342 + stripe
343 + highlight-current-row
344 + style="width: 100%"
345 + >
346 + <el-table-column type="index" label="序号" align="center">
347 + </el-table-column>
348 + <el-table-column
349 + v-for="(item, index) in releaseHeader"
350 + header-align="center"
351 + align="center"
352 + :prop="item.value"
353 + :label="item.name"
354 + :key="index"
355 + :show-overflow-tooltip="true"
356 + >
357 + </el-table-column>
358 + </el-table>
359 + <div slot="footer">
360 + <el-button type="primary" @click="close">确 定</el-button>
361 + </div>
362 + </el-dialog>
255 </div> 363 </div>
256 </template> 364 </template>
257 365
258 <script> 366 <script>
259 -import { findConditionData, findCargoData } from "@/api/cargoSelect"; 367 +import { findConditionData, findCargoData , releaseCargo } from "@/api/cargoSelect";
260 import { downLoadXlsx } from "@/utils/zipdownload"; 368 import { downLoadXlsx } from "@/utils/zipdownload";
261 -import { upCase } from "@/utils/FedEx" 369 +import { upCase } from "@/utils/FedEx";
262 370
263 export default { 371 export default {
264 - name:"QueryCargo", 372 + name: "QueryCargo",
265 data() { 373 data() {
266 return { 374 return {
267 formData: { 375 formData: {
...@@ -286,21 +394,21 @@ export default { ...@@ -286,21 +394,21 @@ export default {
286 dataSources: "", 394 dataSources: "",
287 customsReceiptStatusId: null, 395 customsReceiptStatusId: null,
288 big: null, 396 big: null,
289 - cargoPlaneNo:null, 397 + cargoPlaneNo: null,
290 - cargoPlaneStart:null, 398 + cargoPlaneStart: null,
291 - cargoPlaneEnd:null, 399 + cargoPlaneEnd: null,
292 limitStart: 1, 400 limitStart: 1,
293 - limitSize:100, 401 + limitSize: 100,
294 }, //表单数据 402 }, //表单数据
295 tableHeader: [ 403 tableHeader: [
296 { 404 {
297 name: "口岸代码", 405 name: "口岸代码",
298 value: "portName", 406 value: "portName",
299 - width: "120", 407 + width: "100",
300 align: "center", 408 align: "center",
301 sorTable: true, 409 sorTable: true,
302 fixed: false, 410 fixed: false,
303 - disabled:true 411 + disabled:true,
304 }, 412 },
305 { 413 {
306 name: "取件日期", 414 name: "取件日期",
...@@ -332,7 +440,7 @@ export default { ...@@ -332,7 +440,7 @@ export default {
332 { 440 {
333 name: "运单号", 441 name: "运单号",
334 value: "waybillNo", 442 value: "waybillNo",
335 - width: "150", 443 + width: "120",
336 align: "center", 444 align: "center",
337 sorTable: true, 445 sorTable: true,
338 fixed: false, 446 fixed: false,
...@@ -341,7 +449,7 @@ export default { ...@@ -341,7 +449,7 @@ export default {
341 { 449 {
342 name: "总单号", 450 name: "总单号",
343 value: "totalWaybillNo", 451 value: "totalWaybillNo",
344 - width: "150", 452 + width: "120",
345 align: "center", 453 align: "center",
346 sorTable: true, 454 sorTable: true,
347 fixed: false, 455 fixed: false,
...@@ -359,7 +467,7 @@ export default { ...@@ -359,7 +467,7 @@ export default {
359 { 467 {
360 name: "服务代码", 468 name: "服务代码",
361 value: "serviceCode", 469 value: "serviceCode",
362 - width: "90", 470 + width: "100",
363 align: "center", 471 align: "center",
364 sorTable: false, 472 sorTable: false,
365 fixed: false, 473 fixed: false,
...@@ -375,6 +483,24 @@ export default { ...@@ -375,6 +483,24 @@ export default {
375 disabled:true 483 disabled:true
376 }, 484 },
377 { 485 {
486 + name: "推送状态",
487 + value: "cargoAllocationDataStatus",
488 + width: "100",
489 + align: "center",
490 + sorTable: true,
491 + fixed: false,
492 + disabled:true
493 + },
494 + {
495 + name: "释放状态",
496 + value: "releasing",
497 + width: "100",
498 + align: "center",
499 + sorTable: true,
500 + fixed: false,
501 + disabled:true
502 + },
503 + {
378 name: "申报类型", 504 name: "申报类型",
379 value: "typeName", 505 value: "typeName",
380 width: "100", 506 width: "100",
...@@ -395,7 +521,7 @@ export default { ...@@ -395,7 +521,7 @@ export default {
395 { 521 {
396 name: "subcategory", 522 name: "subcategory",
397 value: "subCategory", 523 value: "subCategory",
398 - width: "150", 524 + width: "140",
399 align: "center", 525 align: "center",
400 sorTable: true, 526 sorTable: true,
401 fixed: false, 527 fixed: false,
...@@ -458,13 +584,22 @@ export default { ...@@ -458,13 +584,22 @@ export default {
458 { 584 {
459 name: "航班预审意见", 585 name: "航班预审意见",
460 value: "caPretrialOpinion", 586 value: "caPretrialOpinion",
461 - width: "140", 587 + width: "120",
462 align: "center", 588 align: "center",
463 sorTable: false, 589 sorTable: false,
464 fixed: false, 590 fixed: false,
465 disabled:true 591 disabled:true
466 }, 592 },
467 { 593 {
594 + name: "AccsPool",
595 + value: "accsPool",
596 + width: "120",
597 + align: "center",
598 + sorTable: true,
599 + fixed: false,
600 + disabled:true
601 + },
602 + {
468 name: "货物状态", 603 name: "货物状态",
469 value: "statusName", 604 value: "statusName",
470 width: "100", 605 width: "100",
...@@ -476,7 +611,7 @@ export default { ...@@ -476,7 +611,7 @@ export default {
476 { 611 {
477 name: "终配航班号", 612 name: "终配航班号",
478 value: "finalFlightNo", 613 value: "finalFlightNo",
479 - width: "130", 614 + width: "120",
480 align: "center", 615 align: "center",
481 sorTable: true, 616 sorTable: true,
482 fixed: false, 617 fixed: false,
...@@ -485,7 +620,7 @@ export default { ...@@ -485,7 +620,7 @@ export default {
485 { 620 {
486 name: "终配航班日期", 621 name: "终配航班日期",
487 value: "finalFlightTime", 622 value: "finalFlightTime",
488 - width: "150", 623 + width: "140",
489 align: "center", 624 align: "center",
490 sorTable: true, 625 sorTable: true,
491 fixed: false, 626 fixed: false,
...@@ -494,7 +629,7 @@ export default { ...@@ -494,7 +629,7 @@ export default {
494 { 629 {
495 name: "二配航班号", 630 name: "二配航班号",
496 value: "twoMatchFlightNo", 631 value: "twoMatchFlightNo",
497 - width: "130", 632 + width: "120",
498 align: "center", 633 align: "center",
499 sorTable: true, 634 sorTable: true,
500 fixed: false, 635 fixed: false,
...@@ -512,7 +647,7 @@ export default { ...@@ -512,7 +647,7 @@ export default {
512 { 647 {
513 name: "预配航班号", 648 name: "预配航班号",
514 value: "preplanFlightNo", 649 value: "preplanFlightNo",
515 - width: "130", 650 + width: "120",
516 align: "center", 651 align: "center",
517 sorTable: true, 652 sorTable: true,
518 fixed: false, 653 fixed: false,
...@@ -530,7 +665,7 @@ export default { ...@@ -530,7 +665,7 @@ export default {
530 { 665 {
531 name: "ACCS原航班号", 666 name: "ACCS原航班号",
532 value: "fltNoAccs", 667 value: "fltNoAccs",
533 - width: "140", 668 + width: "150",
534 align: "center", 669 align: "center",
535 sorTable: true, 670 sorTable: true,
536 fixed: false, 671 fixed: false,
...@@ -548,7 +683,7 @@ export default { ...@@ -548,7 +683,7 @@ export default {
548 { 683 {
549 name: "ACCS原航线", 684 name: "ACCS原航线",
550 value: "accsFlightRoute", 685 value: "accsFlightRoute",
551 - width: "150", 686 + width: "140",
552 align: "center", 687 align: "center",
553 sorTable: true, 688 sorTable: true,
554 fixed: false, 689 fixed: false,
...@@ -575,7 +710,7 @@ export default { ...@@ -575,7 +710,7 @@ export default {
575 { 710 {
576 name: "发件人账号", 711 name: "发件人账号",
577 value: "shipperAccount", 712 value: "shipperAccount",
578 - width: "150", 713 + width: "120",
579 align: "center", 714 align: "center",
580 sorTable: false, 715 sorTable: false,
581 fixed: false, 716 fixed: false,
...@@ -593,7 +728,7 @@ export default { ...@@ -593,7 +728,7 @@ export default {
593 { 728 {
594 name: "始发地城市名称", 729 name: "始发地城市名称",
595 value: "originCity", 730 value: "originCity",
596 - width: "150", 731 + width: "130",
597 align: "center", 732 align: "center",
598 sorTable: false, 733 sorTable: false,
599 fixed: false, 734 fixed: false,
...@@ -629,7 +764,7 @@ export default { ...@@ -629,7 +764,7 @@ export default {
629 { 764 {
630 name: "大货预审时间", 765 name: "大货预审时间",
631 value: "bigPretrialTime", 766 value: "bigPretrialTime",
632 - width: "150", 767 + width: "120",
633 align: "center", 768 align: "center",
634 sorTable: false, 769 sorTable: false,
635 fixed: false, 770 fixed: false,
...@@ -665,36 +800,109 @@ export default { ...@@ -665,36 +800,109 @@ export default {
665 { 800 {
666 name: "创建时间", 801 name: "创建时间",
667 value: "createTime", 802 value: "createTime",
668 - width: "120", 803 + width: "100",
669 align: "center", 804 align: "center",
670 sorTable: true, 805 sorTable: true,
671 fixed: false, 806 fixed: false,
672 disabled:true 807 disabled:true
673 }, 808 },
674 ], //表头数据 809 ], //表头数据
810 + releaseHeader:[
811 + {
812 + type: "",
813 + name: "提示信息",
814 + value: "msg",
815 + width: "",
816 + align: "center",
817 + sorTable: true,
818 + fixed: false,
819 + disabled:true
820 + },
821 + {
822 + type: "",
823 + name: "口岸代码",
824 + value: "portName",
825 + width: "",
826 + align: "center",
827 + sorTable: true,
828 + fixed: false,
829 + disabled:true
830 + },
831 + {
832 + type: "",
833 + name: "运单号",
834 + value: "waybillNo",
835 + width: "",
836 + align: "center",
837 + sorTable: true,
838 + fixed: false,
839 + disabled:true
840 + },
841 + {
842 + type: "",
843 + name: "推送状态",
844 + value: "cargoAllocationDataStatus",
845 + width: "",
846 + align: "center",
847 + sorTable: true,
848 + fixed: false,
849 + disabled:true
850 + },
851 + {
852 + type: "",
853 + name: "释放状态",
854 + value: "releasing",
855 + width: "",
856 + align: "center",
857 + sorTable: true,
858 + fixed: false,
859 + disabled:true
860 + },
861 + {
862 + type: "",
863 + name: "accsPool",
864 + value: "accsPool",
865 + width: "",
866 + align: "center",
867 + sorTable: true,
868 + fixed: false,
869 + disabled:true
870 + },
871 + {
872 + type: "",
873 + name: "货物状态",
874 + value: "statusName",
875 + width: "",
876 + align: "center",
877 + sorTable: true,
878 + fixed: false,
879 + disabled:true
880 + }
881 + ],
675 findConditionData: {}, //货物查询条件 882 findConditionData: {}, //货物查询条件
676 - tableData: [], //表格数据 883 + tableData:[], //表格数据
677 allWeight: 0, 884 allWeight: 0,
678 allQty: 0, 885 allQty: 0,
679 shiftKey: false, 886 shiftKey: false,
680 valueFormat: "yyyy-MM-dd", 887 valueFormat: "yyyy-MM-dd",
681 tableLoading: false, 888 tableLoading: false,
682 - downLoadingTip:{ 889 + downLoadingTip: {
683 - tip:"", 890 + tip: "",
684 - downloading:false, 891 + downloading: false,
685 - }, 892 + }, //导出状态
686 totalCount: 0, 893 totalCount: 0,
687 selectTable: [], 894 selectTable: [],
688 flightTime: [], 895 flightTime: [],
689 prepalyFlightTime: [], 896 prepalyFlightTime: [],
690 - cargoPlaneTime:[], 897 + cargoPlaneTime: [],
691 createDate: [], 898 createDate: [],
692 limitStart: 1, 899 limitStart: 1,
693 limitSize: 100, //无限制-1 900 limitSize: 100, //无限制-1
694 - page:1, 901 + page: 1,
695 - progress:0, 902 + progress: 0,
696 tableHeight:null, 903 tableHeight:null,
697 - formShow:true, 904 + dialogVisible:false,
905 + formShow: true, //菜单隐藏
698 }; 906 };
699 }, 907 },
700 created() { 908 created() {
...@@ -736,9 +944,13 @@ export default { ...@@ -736,9 +944,13 @@ export default {
736 this.shiftKey = false; 944 this.shiftKey = false;
737 } 945 }
738 }); 946 });
739 - this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-80 947 + this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-50
948 + },
949 + watch:{
950 + formShow(val,oldVal){
951 + this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-120
952 + }
740 }, 953 },
741 -
742 methods: { 954 methods: {
743 clear() { 955 clear() {
744 this.$refs.cargoForm.resetFields(); 956 this.$refs.cargoForm.resetFields();
...@@ -750,12 +962,13 @@ export default { ...@@ -750,12 +962,13 @@ export default {
750 this.allQty = 0; 962 this.allQty = 0;
751 this.tableLoading = true; 963 this.tableLoading = true;
752 this.dataInfo(); 964 this.dataInfo();
753 - if(val === 0){ 965 + if (val === 0) {
754 this.formData.limitStart = 1; 966 this.formData.limitStart = 1;
755 this.limitStart = 1; 967 this.limitStart = 1;
756 this.page = 1; 968 this.page = 1;
757 } 969 }
758 - findCargoData(this.formData).then((res) => { 970 + findCargoData(this.formData)
971 + .then((res) => {
759 if (res.code == 200) { 972 if (res.code == 200) {
760 this.tableData = res.data.list; 973 this.tableData = res.data.list;
761 this.totalCount = res.data.totalCount; 974 this.totalCount = res.data.totalCount;
...@@ -776,97 +989,146 @@ export default { ...@@ -776,97 +989,146 @@ export default {
776 }); 989 });
777 } 990 }
778 this.tableLoading = false; 991 this.tableLoading = false;
779 - }).catch(()=>{ 992 + })
993 + .catch(() => {
780 this.tableLoading = false; 994 this.tableLoading = false;
781 }); 995 });
782 this.$refs.newTables.clearTable(); 996 this.$refs.newTables.clearTable();
783 this.cargoTotal(); 997 this.cargoTotal();
784 }, 998 },
999 + //释放仓位
1000 + release(){
1001 + let idList = []
1002 + this.selectTable.map(item => {
1003 + item.msg = ''
1004 + idList.push(item.id)
1005 + })
1006 + releaseCargo(idList).then(res=>{
1007 + if(res.code === 200){
1008 + this.$message({
1009 + message: res.msg,
1010 + type: "success",
1011 + });
1012 + }else if(res.code === 201){
1013 + this.selectTable.map(item => {
1014 + res.data['success'].map(val=>{
1015 + val === item.id ? item.msg = item.msg+'操作成功,正在释放中。' : ''
1016 + })
1017 + res.data['accsPoolFlase'].map(val=>{
1018 + val === item.id ? item.msg = item.msg+'accs pool状态不正确。' : ''
1019 + })
1020 + res.data['existReleasing'].map(val=>{
1021 + val === item.id ? item.msg = item.msg+'已经在释放，请勿重复释放。' : ''
1022 + })
1023 + res.data['noFlight'].map(val=>{
1024 + val === item.id ? item.msg = item.msg+'无配载航班。' : ''
1025 + })
1026 + })
1027 + this.dialogVisible = true
1028 + }else{
1029 + this.$message({
1030 + message: res.msg,
1031 + type: "warning",
1032 + });
1033 + }
1034 + }).catch(err=>{
1035 + console.log(err)
1036 + })
1037 + },
1038 + //关闭弹窗
1039 + close(){
1040 + this.dialogVisible = false
1041 + this.selectTable = []
1042 + this.select()
1043 + },
785 //数据初始化 1044 //数据初始化
786 - dataInfo(){ 1045 + dataInfo() {
787 - if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){ 1046 + if (
1047 + this.formData.customsReceiptStatusId != null &&
1048 + this.formData.customsReceiptStatusId.length < 1
1049 + ) {
788 this.formData.customsReceiptStatusId = null; 1050 this.formData.customsReceiptStatusId = null;
789 } 1051 }
790 if (this.createDate != null && this.createDate.length > 0) { 1052 if (this.createDate != null && this.createDate.length > 0) {
791 this.formData.createTimeStart = this.createDate[0]; 1053 this.formData.createTimeStart = this.createDate[0];
792 this.formData.createTimeEnd = this.createDate[1]; 1054 this.formData.createTimeEnd = this.createDate[1];
793 - }else{ 1055 + } else {
794 this.formData.createTimeStart = null; 1056 this.formData.createTimeStart = null;
795 this.formData.createTimeEnd = null; 1057 this.formData.createTimeEnd = null;
796 } 1058 }
797 if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) { 1059 if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) {
798 this.formData.prematchFltDateStart = this.prepalyFlightTime[0]; 1060 this.formData.prematchFltDateStart = this.prepalyFlightTime[0];
799 this.formData.prematchFltDateEnd = this.prepalyFlightTime[1]; 1061 this.formData.prematchFltDateEnd = this.prepalyFlightTime[1];
800 - }else{ 1062 + } else {
801 - this.formData.prematchFltDateStart =""; 1063 + this.formData.prematchFltDateStart = "";
802 this.formData.prematchFltDateEnd = ""; 1064 this.formData.prematchFltDateEnd = "";
803 } 1065 }
804 if (this.flightTime != null && this.flightTime.length > 0) { 1066 if (this.flightTime != null && this.flightTime.length > 0) {
805 this.formData.fltDateStart = this.flightTime[0]; 1067 this.formData.fltDateStart = this.flightTime[0];
806 this.formData.fltDateEnd = this.flightTime[1]; 1068 this.formData.fltDateEnd = this.flightTime[1];
807 - }else{ 1069 + } else {
808 this.formData.fltDateStart = ""; 1070 this.formData.fltDateStart = "";
809 this.formData.fltDateEnd = ""; 1071 this.formData.fltDateEnd = "";
810 } 1072 }
811 - if(this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0){ 1073 + if (this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0) {
812 this.formData.cargoPlaneStart = this.cargoPlaneTime[0]; 1074 this.formData.cargoPlaneStart = this.cargoPlaneTime[0];
813 this.formData.cargoPlaneEnd = this.cargoPlaneTime[1]; 1075 this.formData.cargoPlaneEnd = this.cargoPlaneTime[1];
814 - }else{ 1076 + } else {
815 this.formData.cargoPlaneStart = null; 1077 this.formData.cargoPlaneStart = null;
816 this.formData.cargoPlaneEnd = null; 1078 this.formData.cargoPlaneEnd = null;
817 } 1079 }
818 - if(this.formData.waybillNo){ 1080 + if (this.formData.waybillNo) {
819 this.formData.waybillNo = this.formData.waybillNo.trim(); 1081 this.formData.waybillNo = this.formData.waybillNo.trim();
820 } 1082 }
821 this.formData.limitStart = this.limitStart; 1083 this.formData.limitStart = this.limitStart;
822 this.formData.limitSize = 100; 1084 this.formData.limitSize = 100;
823 }, 1085 },
824 //总和 1086 //总和
825 - cargoTotal(){ 1087 + cargoTotal() {
826 this.allWeight = 0; 1088 this.allWeight = 0;
827 this.allQty = 0; 1089 this.allQty = 0;
828 - if(this.selectTable.length > 0){ 1090 + if (this.selectTable.length > 0) {
829 - this.selectTable.forEach(item=>{ 1091 + this.selectTable.forEach((item) => {
830 this.allWeight = this.allWeight + item.actualWeight; 1092 this.allWeight = this.allWeight + item.actualWeight;
831 this.allQty = this.allQty + item.qty; 1093 this.allQty = this.allQty + item.qty;
832 - }) 1094 + });
833 this.allWeight = this.allWeight.toFixed(2); 1095 this.allWeight = this.allWeight.toFixed(2);
834 this.allQty = this.allQty.toFixed(); 1096 this.allQty = this.allQty.toFixed();
835 } 1097 }
836 }, 1098 },
837 //表格多选 1099 //表格多选
838 - tableSelect(val){ 1100 + tableSelect(val) {
839 this.selectTable = val.selection; 1101 this.selectTable = val.selection;
840 this.cargoTotal(); 1102 this.cargoTotal();
841 }, 1103 },
842 //表格全选 1104 //表格全选
843 - tableSelectAll(val){ 1105 + tableSelectAll(val) {
844 this.selectTable = val; 1106 this.selectTable = val;
845 this.cargoTotal(); 1107 this.cargoTotal();
846 }, 1108 },
847 //分页 1109 //分页
848 - currentChange(val){ 1110 + currentChange(val) {
849 this.formData.limitStart = val.start; 1111 this.formData.limitStart = val.start;
850 this.limitStart = val.start; 1112 this.limitStart = val.start;
851 this.page = val.page; 1113 this.page = val.page;
852 - this.select() 1114 + this.select();
853 }, 1115 },
854 //排序 1116 //排序
855 - sortChange(val){ 1117 + sortChange(val) {
856 - let data = [] 1118 + let data = [];
857 - let nullData = [] 1119 + let nullData = [];
858 - this.tableData.forEach(item=>{ 1120 + this.tableData.forEach((item) => {
859 - if(item[val.prop]){ 1121 + if (item[val.prop]) {
860 - data.push(item) 1122 + data.push(item);
861 - }else{ 1123 + } else {
862 - nullData.push(item) 1124 + nullData.push(item);
863 - } 1125 + }
864 - }) 1126 + });
865 - data = data.sort(this.$refs.newTables.compare(val.prop,val.order)) 1127 + data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
866 - if(val.order != "ascending"){ 1128 + if (val.order != "ascending") {
867 - this.tableData = nullData.concat(data) 1129 + this.tableData = nullData.concat(data);
868 - }else{ 1130 + } else {
869 - this.tableData = data.concat(nullData) 1131 + this.tableData = data.concat(nullData);
870 } 1132 }
871 this.tableData.forEach((item, index = 0) => { 1133 this.tableData.forEach((item, index = 0) => {
872 item.index = index; 1134 item.index = index;
...@@ -880,36 +1142,40 @@ export default { ...@@ -880,36 +1142,40 @@ export default {
880 xlse(page) { 1142 xlse(page) {
881 this.progress = 1; 1143 this.progress = 1;
882 this.downLoadingTip.downloading = true; 1144 this.downLoadingTip.downloading = true;
883 - let cargoXlse = {title:"货物导出表",cargoConditionDto:{}}; 1145 + let cargoXlse = { title: "货物导出表", cargoConditionDto: {} };
884 this.dataInfo(); 1146 this.dataInfo();
885 cargoXlse.cargoConditionDto = this.formData; 1147 cargoXlse.cargoConditionDto = this.formData;
886 cargoXlse.cargoConditionDto.limitSize = this.limitSize; 1148 cargoXlse.cargoConditionDto.limitSize = this.limitSize;
887 1149
888 if (page == 0) { 1150 if (page == 0) {
889 - this.downLoadingTip.tip = "正在导出本页结果集" 1151 + this.downLoadingTip.tip = "正在导出本页结果集";
890 cargoXlse.cargoConditionDto.limitStart = this.limitStart; 1152 cargoXlse.cargoConditionDto.limitStart = this.limitStart;
891 - downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{ 1153 + downLoadXlsx("/cargo/excel", cargoXlse, "货物表")
892 - this.downLoadingTip.downloading = false; 1154 + .then(() => {
893 - this.downLoadingTip.tip = ""
894 - this.progress = 100;
895 - }).catch(()=>{
896 - this.downLoadingTip.downloading = false;
897 - this.downLoadingTip.tip = "";
898 - })
899 - } else {
900 - if(this.totalCount < 80000){
901 - this.downLoadingTip.tip = "正在导出全部结果集请耐心等待"
902 - cargoXlse.cargoConditionDto.limitStart = 0;
903 - cargoXlse.cargoConditionDto.limitSize = -1;
904 - downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
905 this.downLoadingTip.downloading = false; 1155 this.downLoadingTip.downloading = false;
906 - this.downLoadingTip.tip = "" 1156 + this.downLoadingTip.tip = "";
907 this.progress = 100; 1157 this.progress = 100;
908 - }).catch(()=>{
909 - this.downLoadingTip.downloading = false;
910 - this.downLoadingTip.tip = ""
911 }) 1158 })
912 - }else{ 1159 + .catch(() => {
1160 + this.downLoadingTip.downloading = false;
1161 + this.downLoadingTip.tip = "";
1162 + });
1163 + } else {
1164 + if (this.totalCount < 80000) {
1165 + this.downLoadingTip.tip = "正在导出全部结果集请耐心等待";
1166 + cargoXlse.cargoConditionDto.limitStart = 0;
1167 + cargoXlse.cargoConditionDto.limitSize = -1;
1168 + downLoadXlsx("/cargo/excel", cargoXlse, "货物表")
1169 + .then(() => {
1170 + this.downLoadingTip.downloading = false;
1171 + this.downLoadingTip.tip = "";
1172 + this.progress = 100;
1173 + })
1174 + .catch(() => {
1175 + this.downLoadingTip.downloading = false;
1176 + this.downLoadingTip.tip = "";
1177 + });
1178 + } else {
913 this.downLoadingTip.downloading = false; 1179 this.downLoadingTip.downloading = false;
914 this.$message({ 1180 this.$message({
915 message: "导出数据量过大，请不要超过8万条", 1181 message: "导出数据量过大，请不要超过8万条",
...@@ -918,6 +1184,7 @@ export default { ...@@ -918,6 +1184,7 @@ export default {
918 } 1184 }
919 } 1185 }
920 }, 1186 },
1187 + formatter(){}
921 }, 1188 },
922 computed: { 1189 computed: {
923 fltNo: { 1190 fltNo: {
...@@ -944,14 +1211,14 @@ export default { ...@@ -944,14 +1211,14 @@ export default {
944 this.formData.ursa = upCase(val); 1211 this.formData.ursa = upCase(val);
945 }, 1212 },
946 }, 1213 },
947 - cargoPlaneNo:{ 1214 + cargoPlaneNo: {
948 get: function () { 1215 get: function () {
949 return this.formData.cargoPlaneNo; 1216 return this.formData.cargoPlaneNo;
950 }, 1217 },
951 set: function (val) { 1218 set: function (val) {
952 this.formData.cargoPlaneNo = upCase(val); 1219 this.formData.cargoPlaneNo = upCase(val);
953 }, 1220 },
954 - } 1221 + },
955 }, 1222 },
956 }; 1223 };
957 </script> 1224 </script>
...@@ -964,19 +1231,19 @@ export default { ...@@ -964,19 +1231,19 @@ export default {
964 margin-top: 10px; 1231 margin-top: 10px;
965 margin-left: 50px; 1232 margin-left: 50px;
966 } 1233 }
967 -.progress{ 1234 +.progress {
968 - width:200px; 1235 + width: 200px;
969 display: inline-block; 1236 display: inline-block;
970 - margin:0 0 0 20px; 1237 + margin: 0 0 0 20px;
971 } 1238 }
972 -.formShow{ 1239 +.formShow {
973 width: max-content; 1240 width: max-content;
974 - height:48px; 1241 + height: 48px;
975 line-height: 48px; 1242 line-height: 48px;
976 font-weight: 900; 1243 font-weight: 900;
977 color: rgb(64, 158, 255); 1244 color: rgb(64, 158, 255);
978 font-size: 14px; 1245 font-size: 14px;
979 float: right; 1246 float: right;
980 - margin-right:20px; 1247 + margin-right: 20px;
981 } 1248 }
982 </style> 1249 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 +<template>
2 + <div>
3 + <el-form
4 + ref="dmLogForm"
5 + class="form-header"
6 + :model="selectForm"
7 + label-width="auto"
8 + size="small"
9 + :rules="rules"
10 + >
11 + <el-row type="flex" style="flex-wrap: wrap !important">
12 + <el-col :span="6">
13 + <el-form-item label="ACCS航班号">
14 + <el-input
15 + v-model.trim="fltNo"
16 + class="formItem"
17 + placeholder="请输入航班号"
18 + clearable
19 + ></el-input>
20 + </el-form-item>
21 + </el-col>
22 + <el-col :span="6">
23 + <el-form-item label="创建日期" prop="createTime">
24 + <el-date-picker
25 + v-model="selectForm.createTime"
26 + class="formItem"
27 + type="date"
28 + placeholder="选择日期"
29 + :value-format="valueFormat"
30 + :clearable="false"
31 + >
32 + </el-date-picker>
33 + </el-form-item>
34 + </el-col>
35 + <el-col :span="6">
36 + <el-form-item label="配舱结果">
37 + <el-select
38 + v-model="selectForm.status"
39 + class="formItem"
40 + placeholder="不限"
41 + clearable
42 + >
43 + <el-option label="0-未处理" value="0"></el-option>
44 + <el-option label="1-已处理" value="1"></el-option>
45 + <el-option label="2-处理失败" value="2"></el-option>
46 + <el-option label="3-无需处理" value="3"></el-option>
47 + <el-option label="4-校验不通过" value="4"></el-option>
48 + <el-option label="5-数据不能被多次处理" value="5"></el-option>
49 + <el-option label="9-处理中" value="9"></el-option>
50 + </el-select>
51 + </el-form-item>
52 + </el-col>
53 + <el-col :span="6">
54 + <el-form-item label="航班日期">
55 + <el-date-picker
56 + v-model="selectForm.fltDate"
57 + class="formItem"
58 + type="date"
59 + placeholder="选择日期"
60 + :value-format="valueFormat"
61 + clearable
62 + >
63 + </el-date-picker>
64 + </el-form-item>
65 + </el-col>
66 + <el-col :span="6">
67 + <el-form-item label="口岸代码">
68 + <el-select
69 + v-model="selectForm.portName"
70 + class="formItem"
71 + placeholder="不限"
72 + clearable
73 + >
74 + <el-option
75 + v-for="item in portList"
76 + :label="item.englishName"
77 + :value="item.englishName"
78 + :key="item.id"
79 + ></el-option>
80 + </el-select>
81 + </el-form-item>
82 + </el-col>
83 + </el-row>
84 + <div>
85 + <el-button
86 + type="primary"
87 + size="small"
88 + icon="el-icon-search"
89 + :loading="loading"
90 + :disabled="!selectForm.createTime"
91 + @click="selectDMData(0)"
92 + >查询</el-button
93 + >
94 + </div>
95 + </el-form>
96 + <Tables
97 + ref="dmLogTables"
98 + ductName="logDmData"
99 + :data="data"
100 + :headerData="tableHeader"
101 + :infoShow="false"
102 + :height="tableHeight"
103 + :page="selectForm.page"
104 + :pageSizes="[100]"
105 + :totalCount="total"
106 + :loading="loading"
107 + @currentChange="currentChange"
108 + @sortChange="sortChange"
109 + >
110 + <template v-slot:status="scope">
111 + <el-tag
112 + :type="
113 + scope.row.status == 1
114 + ? 'success'
115 + : scope.row.status == 2
116 + ? 'danger'
117 + : scope.row.status == 3
118 + ? 'warning'
119 + : scope.row.status == 4
120 + ? 'warning'
121 + : scope.row.status == 5
122 + ? 'warning'
123 + : ''
124 + "
125 + ><span>{{ statusData(scope.row.status) }}</span></el-tag
126 + >
127 + </template>
128 + </Tables>
129 + </div>
130 +</template>
131 +
132 +<script>
133 +import dictLabels from "../../../assets/languages/dictLabels.js";
134 +import { portNameList } from "@/api/system/user.js";
135 +import { getDmDataList } from "@/api/system/logConfig.js";
136 +import { upCase } from "@/utils/FedEx";
137 +
138 +export default {
139 + name: "DmLog",
140 + data() {
141 + return {
142 + selectForm: {
143 + fltNo: undefined,
144 + createTime: undefined,
145 + page: 1,
146 + size: 100,
147 + },
148 + data: [],
149 + tableHeader: [
150 + {
151 + name: "配舱结果",
152 + value: "status",
153 + width: "120",
154 + align: "center",
155 + sorTable: true,
156 + fixed: false,
157 + disabled: true,
158 + slot: true,
159 + },
160 + {
161 + name: "处理结果",
162 + value: "processResult",
163 + width: "100",
164 + align: "center",
165 + sorTable: true,
166 + fixed: false,
167 + disabled: true,
168 + },
169 + {
170 + name: "异常代码",
171 + value: "exceptionCode",
172 + width: "100",
173 + align: "center",
174 + sorTable: true,
175 + fixed: false,
176 + disabled: true,
177 + },
178 + {
179 + name: "运单ID",
180 + value: "accsId",
181 + width: "100",
182 + align: "center",
183 + sorTable: true,
184 + fixed: false,
185 + disabled: true,
186 + },
187 + {
188 + name: "运单号",
189 + value: "awbNbr",
190 + width: "100",
191 + align: "center",
192 + sorTable: true,
193 + fixed: false,
194 + disabled: true,
195 + },
196 + {
197 + name: "口岸代码",
198 + value: "routeDest",
199 + width: "100",
200 + align: "center",
201 + sorTable: true,
202 + fixed: false,
203 + disabled: true,
204 + },
205 + {
206 + name: "ACCS航班号",
207 + value: "flightNbr",
208 + width: "130",
209 + align: "center",
210 + sorTable: true,
211 + fixed: false,
212 + disabled: true,
213 + },
214 + {
215 + name: "ACCS航班日期",
216 + value: "flightDate",
217 + width: "140",
218 + align: "center",
219 + sorTable: true,
220 + fixed: false,
221 + disabled: true,
222 + },
223 + {
224 + name: "ACCS航线",
225 + value: "flightRoute",
226 + width: "120",
227 + align: "center",
228 + sorTable: true,
229 + fixed: false,
230 + disabled: true,
231 + },
232 + {
233 + name: "ACCS Pool",
234 + value: "accsPool",
235 + width: "120",
236 + align: "center",
237 + sorTable: true,
238 + fixed: false,
239 + disabled: true,
240 + },
241 + {
242 + name: "消息代码",
243 + value: "messageCode",
244 + width: "120",
245 + align: "center",
246 + sorTable: true,
247 + fixed: false,
248 + disabled: true,
249 + },
250 + {
251 + name: "消息发送时间",
252 + value: "sendTime",
253 + width: "140",
254 + align: "center",
255 + sorTable: true,
256 + fixed: false,
257 + disabled: true,
258 + },
259 + {
260 + name: "消息落地时间",
261 + value: "createTime",
262 + width: "140",
263 + align: "center",
264 + sorTable: true,
265 + fixed: false,
266 + disabled: true,
267 + },
268 + {
269 + name: "总单号",
270 + value: "mawb",
271 + width: "100",
272 + align: "center",
273 + sorTable: true,
274 + fixed: false,
275 + disabled: true,
276 + },
277 + {
278 + name: "运单类型",
279 + value: "classification",
280 + width: "100",
281 + align: "center",
282 + sorTable: true,
283 + fixed: false,
284 + disabled: true,
285 + },
286 + {
287 + name: "报关方式",
288 + value: "portName",
289 + width: "100",
290 + align: "center",
291 + sorTable: true,
292 + fixed: false,
293 + disabled: true,
294 + },
295 + {
296 + name: "总件数",
297 + value: "totalPcs",
298 + width: "100",
299 + align: "center",
300 + sorTable: true,
301 + fixed: false,
302 + disabled: true,
303 + },
304 + {
305 + name: "总重量",
306 + value: "weight",
307 + width: "100",
308 + align: "center",
309 + sorTable: true,
310 + fixed: false,
311 + disabled: true,
312 + },
313 + {
314 + name: "取件日期",
315 + value: "pickUpDate",
316 + width: "100",
317 + align: "center",
318 + sorTable: true,
319 + fixed: false,
320 + disabled: true,
321 + },
322 + {
323 + name: "URSA",
324 + value: "ursa",
325 + width: "100",
326 + align: "center",
327 + sorTable: true,
328 + fixed: false,
329 + disabled: true,
330 + },
331 + {
332 + name: "海关回执代码",
333 + value: "ent",
334 + width: "130",
335 + align: "center",
336 + sorTable: true,
337 + fixed: false,
338 + disabled: true,
339 + },
340 + {
341 + name: "Handing Code",
342 + value: "handlingCode",
343 + width: "140",
344 + align: "center",
345 + sorTable: true,
346 + fixed: false,
347 + disabled: true,
348 + },
349 + {
350 + name: "subCategory",
351 + value: "subCategory",
352 + width: "140",
353 + align: "center",
354 + sorTable: true,
355 + fixed: false,
356 + disabled: true,
357 + },
358 + {
359 + name: "intercept Code",
360 + value: "interceptCode",
361 + width: "140",
362 + align: "center",
363 + sorTable: true,
364 + fixed: false,
365 + disabled: true,
366 + },
367 + {
368 + name: "ACCS发送时间",
369 + value: "accsSendTime",
370 + width: "140",
371 + align: "center",
372 + sorTable: true,
373 + fixed: false,
374 + disabled: true,
375 + },
376 + {
377 + name: "品名描述",
378 + value: "description",
379 + width: "100",
380 + align: "center",
381 + sorTable: true,
382 + fixed: false,
383 + disabled: true,
384 + },
385 + {
386 + name: "PUPOrPUX",
387 + value: "pupOrPux",
388 + width: "120",
389 + align: "center",
390 + sorTable: true,
391 + fixed: false,
392 + disabled: true,
393 + },
394 +
395 + {
396 + name: "始发地站点",
397 + value: "originLocationCode",
398 + width: "120",
399 + align: "center",
400 + sorTable: false,
401 + fixed: false,
402 + disabled: true,
403 + },
404 + {
405 + name: "始发地城市名称",
406 + value: "originCity",
407 + width: "140",
408 + align: "center",
409 + sorTable: true,
410 + fixed: false,
411 + disabled: true,
412 + },
413 + {
414 + name: "收件人国家代码",
415 + value: "consigneeCountry",
416 + width: "140",
417 + align: "center",
418 + sorTable: false,
419 + fixed: false,
420 + disabled: true,
421 + },
422 + {
423 + name: "服务类型名称",
424 + value: "serviceCode",
425 + width: "130",
426 + align: "center",
427 + sorTable: true,
428 + fixed: false,
429 + disabled: true,
430 + },
431 + {
432 + name: "货物ID",
433 + value: "portName",
434 + width: "100",
435 + align: "center",
436 + sorTable: true,
437 + fixed: false,
438 + disabled: true,
439 + },
440 + {
441 + name: "是否RDE手动录入",
442 + value: "manualRde",
443 + width: "160",
444 + align: "center",
445 + sorTable: false,
446 + fixed: false,
447 + disabled: true,
448 + },
449 + {
450 + name: "发件人账号",
451 + value: "shipperAccount",
452 + width: "120",
453 + align: "center",
454 + sorTable: false,
455 + fixed: false,
456 + disabled: true,
457 + },
458 + {
459 + name: "发件公司中文名称",
460 + value: "shipperCompany",
461 + width: "150",
462 + align: "center",
463 + sorTable: true,
464 + fixed: false,
465 + disabled: true,
466 + },
467 + {
468 + name: "修改时间",
469 + value: "updateTime",
470 + width: "100",
471 + align: "center",
472 + sorTable: true,
473 + fixed: false,
474 + disabled: true,
475 + },
476 + {
477 + name: "消息发送程序ID",
478 + value: "senderId",
479 + width: "140",
480 + align: "center",
481 + sorTable: false,
482 + fixed: false,
483 + disabled: true,
484 + },
485 + {
486 + name: "消息接收程序ID",
487 + value: "receiverId",
488 + width: "140",
489 + align: "center",
490 + sorTable: false,
491 + fixed: false,
492 + disabled: true,
493 + },
494 + ],
495 + portList: [],
496 + rules: {
497 + createTime: [
498 + {
499 + required: true,
500 + message: "创建日期不能为空",
501 + trigger: "blur",
502 + },
503 + ],
504 + },
505 + total: 0,
506 + tableHeight: null,
507 + loading: false,
508 + valueFormat: "yyyy-MM-dd",
509 + };
510 + },
511 + created() {
512 + this.nowDate();
513 + portNameList().then((res) => {
514 + if (res.code === 200) {
515 + this.portList = res.data;
516 + } else {
517 + this.$message({
518 + message: "查询条件" + res.msg,
519 + type: "warning",
520 + });
521 + }
522 + });
523 + if (this.$store.state.tagsView.cachedViews.length == 0) {
524 + this.selectDMData();
525 + }
526 + },
527 + activated() {
528 + this.selectDMData();
529 + },
530 + deactivated() {
531 + this.data = [];
532 + },
533 + mounted() {
534 + this.tableHeight =
535 + window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 150;
536 + },
537 + methods: {
538 + //当前日期格式化
539 + nowDate() {
540 + let date = new Date();
541 + this.selectForm.createTime = `${date.getFullYear()}-${
542 + (date.getMonth() + 1).length > 1
543 + ? date.getMonth() + 1
544 + : "0" + (date.getMonth() + 1)
545 + }-${date.getDate()}`;
546 + },
547 + //数据查询
548 + selectDMData(val) {
549 + this.data = [];
550 + this.loading = true;
551 + if (val === 0) {
552 + this.selectForm.page = 1;
553 + }
554 + if (this.selectForm.createTime) {
555 + getDmDataList(this.selectForm).then((res) => {
556 + this.loading = false;
557 + if (res.code === 200) {
558 + if (res.data.total === 0) {
559 + this.$message({
560 + message: "未查询到数据",
561 + type: "warning",
562 + });
563 + } else {
564 + this.data = res.data.list;
565 + this.total = res.data.total;
566 + }
567 + } else {
568 + this.$message({
569 + message: res.msg,
570 + type: "warning",
571 + });
572 + }
573 + });
574 + } else {
575 + this.loading = false;
576 + this.$message({
577 + message: "创建日期不能为空",
578 + type: "warning",
579 + });
580 + }
581 + },
582 + //分页
583 + currentChange(val) {
584 + this.selectForm.page = val.page;
585 + this.selectDMData();
586 + },
587 + //数据处理
588 + statusData(val) {
589 + if (dictLabels["logDmData"]["status"][val]) {
590 + return dictLabels["logDmData"]["status"][val];
591 + } else {
592 + return val;
593 + }
594 + },
595 + //排序
596 + sortChange(val) {
597 + let data = [];
598 + let nullData = [];
599 + this.data.forEach((item) => {
600 + if (item[val.prop]) {
601 + data.push(item);
602 + } else {
603 + nullData.push(item);
604 + }
605 + });
606 + data = data.sort(this.$refs.dmLogTables.compare(val.prop, val.order));
607 + if (val.order != "ascending") {
608 + this.data = nullData.concat(data);
609 + } else {
610 + this.data = data.concat(nullData);
611 + }
612 + this.data.forEach((item, index = 0) => {
613 + item.index = index;
614 + });
615 + },
616 + },
617 + computed: {
618 + fltNo: {
619 + get: function () {
620 + return this.selectForm.fltNo;
621 + },
622 + set: function (val) {
623 + this.selectForm.fltNo = upCase(val);
624 + },
625 + },
626 + },
627 +};
628 +</script>
629 +
630 +<style>
631 +</style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -18,7 +18,7 @@ module.exports = { ...@@ -18,7 +18,7 @@ module.exports = {
18 // 部署生产环境和开发环境下的URL。 18 // 部署生产环境和开发环境下的URL。
19 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 19 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
20 // 例如 https://www.FedEx.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.FedEx.vip/admin/，则设置 baseUrl 为 /admin/。 20 // 例如 https://www.FedEx.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.FedEx.vip/admin/，则设置 baseUrl 为 /admin/。
21 - publicPath: process.env.NODE_ENV === "production" ? "/iMac/" : "/", 21 + publicPath: process.env.NODE_ENV === "production" ? "/test/" : "/",
22 // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） 22 // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
23 outputDir: 'dist', 23 outputDir: 'dist',
24 // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） 24 // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
......