Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
bb4d7c3a 1 parent dd739f67

货物查询导出条件修复，页面缓存修复，样式更改

Inline Side-by-side
Showing 8 changed files with 130 additions and 59 deletions
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 @contextmenu.prevent.native="openMenu(tag,$event)" 14 @contextmenu.prevent.native="openMenu(tag,$event)"
15 > 15 >
16 {{ tag.title }} 16 {{ tag.title }}
17 - <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" /> 17 + <span v-if="tag.name != 'FlightAllocConfigAdd' && tag.name != 'FlightAllocConfigInfo' && !isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
18 </router-link> 18 </router-link>
19 </scroll-pane> 19 </scroll-pane>
20 <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu"> 20 <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
......
...@@ -81,7 +81,7 @@ export const constantRoutes = [ ...@@ -81,7 +81,7 @@ export const constantRoutes = [
81 { 81 {
82 path: '/flightAllocConfig/:handle', 82 path: '/flightAllocConfig/:handle',
83 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve), 83 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
84 - name: 'FlightAllocConfigInfo', 84 + name: 'FlightAllocConfigAdd',
85 meta: { title: '添加航班配舱', icon: 'user', breadcrumb: false } 85 meta: { title: '添加航班配舱', icon: 'user', breadcrumb: false }
86 } 86 }
87 ] 87 ]
......
...@@ -860,8 +860,8 @@ export default { ...@@ -860,8 +860,8 @@ export default {
860 this.loading = false; 860 this.loading = false;
861 if (res.code === 200) { 861 if (res.code === 200) {
862 this.tableData = res.data.list; 862 this.tableData = res.data.list;
863 + this.totalCount = res.data.total;
863 if (res.data.list.length > 0) { 864 if (res.data.list.length > 0) {
864 - this.totalCount = res.data.total;
865 this.tableData.forEach((item, index = 0) => { 865 this.tableData.forEach((item, index = 0) => {
866 item.index = index; 866 item.index = index;
867 }); 867 });
...@@ -1004,6 +1004,9 @@ export default { ...@@ -1004,6 +1004,9 @@ export default {
1004 } else { 1004 } else {
1005 this.tableData = data.concat(nullData); 1005 this.tableData = data.concat(nullData);
1006 } 1006 }
1007 + this.tableData.forEach((item, index = 0) => {
1008 + item.index = index;
1009 + });
1007 }, 1010 },
1008 //添加到航班 1011 //添加到航班
1009 addFit() { 1012 addFit() {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 size="mini" 36 size="mini"
37 @click=" 37 @click="
38 $router.push({ 38 $router.push({
39 - name: 'FlightAllocConfigInfo', 39 + name: 'FlightAllocConfigAdd',
40 params: { handle: 'add' }, 40 params: { handle: 'add' },
41 }) 41 })
42 " 42 "
......
1 <template> 1 <template>
2 <div style="margin: 40px" v-loading="loading"> 2 <div style="margin: 40px" v-loading="loading">
3 - <el-empty description="找不到这条数据！" v-if="isEmpty"></el-empty> 3 + <div v-if="isEmpty">
4 + <el-empty description="找不到这条数据！"></el-empty>
5 + <el-button size="small" @click="close">返回</el-button>
6 + </div>
4 <template v-else> 7 <template v-else>
5 <el-form 8 <el-form
6 ref="form" 9 ref="form"
...@@ -249,7 +252,6 @@ ...@@ -249,7 +252,6 @@
249 </el-card> 252 </el-card>
250 </el-form-item> 253 </el-form-item>
251 254
252 - <el-form-item> </el-form-item>
253 </el-form> 255 </el-form>
254 <div style="marginleft: 200px"> 256 <div style="marginleft: 200px">
255 <el-button 257 <el-button
...@@ -317,6 +319,9 @@ export default { ...@@ -317,6 +319,9 @@ export default {
317 btnLoading: false, 319 btnLoading: false,
318 loading: true, 320 loading: true,
319 isEmpty: false, 321 isEmpty: false,
322 + routeName:"",
323 + dataId:"",
324 + handleName:""
320 }; 325 };
321 }, 326 },
322 methods: { 327 methods: {
...@@ -356,7 +361,9 @@ export default { ...@@ -356,7 +361,9 @@ export default {
356 this.formHandlingCode = this.form.handlingCode; 361 this.formHandlingCode = this.form.handlingCode;
357 this.formSubCategory = this.form.subCategory; 362 this.formSubCategory = this.form.subCategory;
358 this.form.isNeedRequired = this.isNeedRequired; 363 this.form.isNeedRequired = this.isNeedRequired;
359 - this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase(); 364 + if(this.form.purposeOfFlightNo){
365 + this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase();
366 + }
360 if (this.isLocation == 1) { 367 if (this.isLocation == 1) {
361 this.form.notLocation = ""; 368 this.form.notLocation = "";
362 } else { 369 } else {
...@@ -428,22 +435,52 @@ export default { ...@@ -428,22 +435,52 @@ export default {
428 this.form.subCategory = this.formSubCategory; 435 this.form.subCategory = this.formSubCategory;
429 }, 436 },
430 close() { 437 close() {
438 + this.removes()
431 this.$store.state.tagsView.visitedViews.splice( 439 this.$store.state.tagsView.visitedViews.splice(
432 this.$store.state.tagsView.visitedViews.findIndex( 440 this.$store.state.tagsView.visitedViews.findIndex(
433 (item) => item.path === this.$route.path 441 (item) => item.path === this.$route.path
434 ), 442 ),
435 1 443 1
436 ); 444 );
437 - this.$router.push( 445 + this.$router.push({name:"FlightAllocConfig"})
438 - this.$store.state.tagsView.visitedViews[ 446 + // this.$router.push(
439 - this.$store.state.tagsView.visitedViews.length - 1 447 + // this.$store.state.tagsView.visitedViews[
440 - ].path 448 + // this.$store.state.tagsView.visitedViews.length - 1
441 - ); 449 + // ].path
450 + // );
442 }, 451 },
452 +
453 + removes(){
454 + if(this.routeName == "FlightAllocConfigAdd"){
455 + sessionStorage.setItem("flightAdd","remove")
456 + }else{
457 + sessionStorage.setItem("flightInfo"+this.dataId,"remove")
458 + }
459 + },
460 + },
461 +
462 + beforeDestroy(){
463 + if(this.routeName == "FlightAllocConfigAdd"){
464 + if(sessionStorage.getItem("flightAdd") == "remove"){
465 + sessionStorage.removeItem("flightAdd")
466 + }else{
467 + this.form.isNeedRequired = this.isNeedRequired
468 + sessionStorage.setItem("flightAdd",JSON.stringify(this.form))
469 + }
470 + }else{
471 + if(sessionStorage.getItem("flightInfo"+this.dataId) == "remove"){
472 + sessionStorage.removeItem("flightInfo"+this.dataId)
473 + }else{
474 + if(this.handleName == "detail"){
475 + this.form.isNeedRequired = this.isNeedRequired
476 + sessionStorage.setItem("flightInfo"+this.dataId,JSON.stringify(this.form))
477 + }
478 + }
479 + }
443 }, 480 },
481 +
444 created() { 482 created() {
445 let handle = this.$route.params.handle; 483 let handle = this.$route.params.handle;
446 -
447 allDictData().then((response) => { 484 allDictData().then((response) => {
448 if (response.code != 200) { 485 if (response.code != 200) {
449 this.$message({ 486 this.$message({
...@@ -463,6 +500,9 @@ export default { ...@@ -463,6 +500,9 @@ export default {
463 this.handlingCode = this.sorttodo(dict.handlingCode, "BLANK"); 500 this.handlingCode = this.sorttodo(dict.handlingCode, "BLANK");
464 this.subCategory = dict.subCategory; 501 this.subCategory = dict.subCategory;
465 }); 502 });
503 + this.routeName = this.$route.name;
504 + this.dataId = this.$route.params.id;
505 + this.handleName = this.$route.params.handle;
466 if (handle === "detail") { 506 if (handle === "detail") {
467 this.disable = true; 507 this.disable = true;
468 } 508 }
...@@ -470,8 +510,17 @@ export default { ...@@ -470,8 +510,17 @@ export default {
470 if (handle != "add") { 510 if (handle != "add") {
471 this.nameDisabled = true; 511 this.nameDisabled = true;
472 let id = this.$route.params.id; 512 let id = this.$route.params.id;
473 - 513 + if(sessionStorage.getItem("flightInfo"+id) && this.$route.name == "FlightAllocConfigInfo" && handle != "detail"){
474 - if (isNaN(Number(id))) { 514 + this.loading = false
515 + this.form = JSON.parse(sessionStorage.getItem("flightInfo"+this.$route.params.id))
516 + this.isNeedRequired = this.form.isNeedRequired;
517 + if(this.form.notLocation != null || this.form.notLocation == ""){
518 + this.isLocation = "2";
519 + }else{
520 + this.isLocation = "1";
521 + }
522 + }else{
523 + if (isNaN(Number(id))) {
475 findDestinationFltRuleByActualFlight(id).then((response) => { 524 findDestinationFltRuleByActualFlight(id).then((response) => {
476 if (response.code != 200) { 525 if (response.code != 200) {
477 this.$message({ 526 this.$message({
...@@ -512,46 +561,58 @@ export default { ...@@ -512,46 +561,58 @@ export default {
512 } else { 561 } else {
513 //货物信息 562 //货物信息
514 findByFlightId(id).then((response) => { 563 findByFlightId(id).then((response) => {
515 - if (response.code != 200) { 564 + if (response.code != 200) {
516 - this.$message({ 565 + this.$message({
517 - showClose: true, 566 + showClose: true,
518 - message: response.msg, 567 + message: response.msg,
519 - type: "error", 568 + type: "error",
520 - }); 569 + });
521 - this.isEmpty = true; 570 + this.isEmpty = true;
522 - } else {
523 - let info = response.data.list;
524 - info.typeOfGoods = info.typeOfGoods
525 - ? info.typeOfGoods.split(";")
526 - : [];
527 - info.declarationCategory = info.declarationCategory
528 - ? info.declarationCategory.split(";")
529 - : [];
530 - info.serviceCode = info.serviceCode
531 - ? info.serviceCode.split(";")
532 - : [];
533 - info.handlingCode = info.handlingCode
534 - ? info.handlingCode.split(";")
535 - : [];
536 - info.subCategory = info.subCategory
537 - ? info.subCategory.split(";")
538 - : [];
539 - this.form = info;
540 - if (info.notLocation != null || info.notLocation == "") {
541 - this.isLocation = "2";
542 } else { 571 } else {
543 - this.isLocation = "1"; 572 + let info = response.data.list;
573 + info.typeOfGoods = info.typeOfGoods
574 + ? info.typeOfGoods.split(";")
575 + : [];
576 + info.declarationCategory = info.declarationCategory
577 + ? info.declarationCategory.split(";")
578 + : [];
579 + info.serviceCode = info.serviceCode
580 + ? info.serviceCode.split(";")
581 + : [];
582 + info.handlingCode = info.handlingCode
583 + ? info.handlingCode.split(";")
584 + : [];
585 + info.subCategory = info.subCategory
586 + ? info.subCategory.split(";")
587 + : [];
588 + this.form = info;
589 + if (info.notLocation != null || info.notLocation == "") {
590 + this.isLocation = "2";
591 + } else {
592 + this.isLocation = "1";
593 + }
594 + let isNeedRequired = response.data.isNeedRequired;
595 + this.form.isNeedRequired = isNeedRequired;
596 + this.isNeedRequired = isNeedRequired;
544 } 597 }
545 - let isNeedRequired = response.data.isNeedRequired; 598 + this.loading = false;
546 - this.form.isNeedRequired = isNeedRequired; 599 + });
547 - this.isNeedRequired = isNeedRequired; 600 + }
548 - }
549 - this.loading = false;
550 - });
551 } 601 }
552 } else { 602 } else {
553 this.loading = false; 603 this.loading = false;
554 } 604 }
605 + if(this.$route.name == "FlightAllocConfigAdd"){
606 + if(sessionStorage.getItem("flightAdd")){
607 + this.form = JSON.parse(sessionStorage.getItem("flightAdd"))
608 + this.isNeedRequired = this.form.isNeedRequired;
609 + if(this.form.notLocation != null || this.form.notLocation == ""){
610 + this.isLocation = "2";
611 + }else{
612 + this.isLocation = "1";
613 + }
614 + }
615 + }
555 }, 616 },
556 computed: { 617 computed: {
557 minNumOfPieces: { 618 minNumOfPieces: {
...@@ -583,7 +644,7 @@ export default { ...@@ -583,7 +644,7 @@ export default {
583 return this.form.minWeight; 644 return this.form.minWeight;
584 }, 645 },
585 set: function (val) { 646 set: function (val) {
586 - if (val == 0 || val == null || val == "-") { 647 + if (val == null || val == "-") {
587 this.form.minWeight = undefined; 648 this.form.minWeight = undefined;
588 } else if (!isNaN(val)) { 649 } else if (!isNaN(val)) {
589 this.form.minWeight = val; 650 this.form.minWeight = val;
...@@ -595,7 +656,7 @@ export default { ...@@ -595,7 +656,7 @@ export default {
595 return this.form.maxWeight; 656 return this.form.maxWeight;
596 }, 657 },
597 set: function (val) { 658 set: function (val) {
598 - if (val == 0 || val == null || val == "-") { 659 + if (val == null || val == "-") {
599 this.form.maxWeight = undefined; 660 this.form.maxWeight = undefined;
600 } else if (!isNaN(val)) { 661 } else if (!isNaN(val)) {
601 this.form.maxWeight = val; 662 this.form.maxWeight = val;
......
...@@ -127,19 +127,20 @@ ...@@ -127,19 +127,20 @@
127 label="运单号" 127 label="运单号"
128 align="center" 128 align="center"
129 prop="waybillNo" 129 prop="waybillNo"
130 - width="120" 130 + width="150"
131 /> 131 />
132 <el-table-column 132 <el-table-column
133 + :show-overflow-tooltip="true"
133 label="品牌描述" 134 label="品牌描述"
134 align="center" 135 align="center"
135 prop="nameDescription" 136 prop="nameDescription"
136 - width="120" 137 + width="150"
137 /> 138 />
138 <el-table-column 139 <el-table-column
139 label="航班日期" 140 label="航班日期"
140 align="center" 141 align="center"
141 prop="fltDate" 142 prop="fltDate"
142 - width="130" 143 + width="150"
143 /> 144 />
144 <el-table-column label="航班号" align="center" prop="fltNo" /> 145 <el-table-column label="航班号" align="center" prop="fltNo" />
145 <el-table-column 146 <el-table-column
...@@ -179,7 +180,7 @@ ...@@ -179,7 +180,7 @@
179 import { findCagroPreData } from "@/api/cargoSelect"; 180 import { findCagroPreData } from "@/api/cargoSelect";
180 import { cargoXlsxPre } from "@/utils/zipdownload"; 181 import { cargoXlsxPre } from "@/utils/zipdownload";
181 export default { 182 export default {
182 - name: "caExportPreQualification", 183 + name: "CAPreQualificationExport",
183 data() { 184 data() {
184 return { 185 return {
185 //导出 186 //导出
......
...@@ -155,12 +155,13 @@ ...@@ -155,12 +155,13 @@
155 </el-col> 155 </el-col>
156 </el-row> --> 156 </el-row> -->
157 <el-table 157 <el-table
158 - max-height="500" 158 + max-height="550"
159 highlight-current-row 159 highlight-current-row
160 border 160 border
161 stripe 161 stripe
162 v-loading="loading" 162 v-loading="loading"
163 :data="findAllFltDatList" 163 :data="findAllFltDatList"
164 + size="small"
164 @selection-change="handleSelectionChange" 165 @selection-change="handleSelectionChange"
165 > 166 >
166 <el-table-column type="selection" width="55" align="center" /> 167 <el-table-column type="selection" width="55" align="center" />
...@@ -177,7 +178,7 @@ ...@@ -177,7 +178,7 @@
177 width="120" 178 width="120"
178 /> 179 />
179 <el-table-column label="航班号" align="center" prop="fltNo" /> 180 <el-table-column label="航班号" align="center" prop="fltNo" />
180 - <el-table-column label="航班路线" align="center" prop="route" /> 181 + <el-table-column label="航班路线" align="center" prop="route" width="150" />
181 <el-table-column 182 <el-table-column
182 label="航班类型" 183 label="航班类型"
183 align="center" 184 align="center"
......
...@@ -748,9 +748,9 @@ export default { ...@@ -748,9 +748,9 @@ export default {
748 this.dataInfo(); 748 this.dataInfo();
749 findCargoData(this.formData).then((res) => { 749 findCargoData(this.formData).then((res) => {
750 if (res.code == 200) { 750 if (res.code == 200) {
751 + this.tableData = res.data.list;
752 + this.totalCount = res.data.totalCount;
751 if (res.data.list.length > 0) { 753 if (res.data.list.length > 0) {
752 - this.tableData = res.data.list;
753 - this.totalCount = res.data.totalCount;
754 for (let i = 0; i < this.tableData.length; i++) { 754 for (let i = 0; i < this.tableData.length; i++) {
755 this.tableData[i].index = i; 755 this.tableData[i].index = i;
756 } 756 }
...@@ -809,6 +809,8 @@ export default { ...@@ -809,6 +809,8 @@ export default {
809 if(this.formData.waybillNo){ 809 if(this.formData.waybillNo){
810 this.formData.waybillNo = this.formData.waybillNo.trim(); 810 this.formData.waybillNo = this.formData.waybillNo.trim();
811 } 811 }
812 + this.formData.limitStart = this.limitStart;
813 + this.formData.limitSize = 100;
812 }, 814 },
813 //总和 815 //总和
814 cargoTotal(){ 816 cargoTotal(){
...@@ -857,6 +859,9 @@ export default { ...@@ -857,6 +859,9 @@ export default {
857 }else{ 859 }else{
858 this.tableData = data.concat(nullData) 860 this.tableData = data.concat(nullData)
859 } 861 }
862 + this.tableData.forEach((item, index = 0) => {
863 + item.index = index;
864 + });
860 }, 865 },
861 // 导出表格 866 // 导出表格
862 xlse(page) { 867 xlse(page) {
......