Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
afc32128 1 parent 46778884

代码修正

Inline Side-by-side
Showing 8 changed files with 156 additions and 80 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 type="primary" 36 type="primary"
37 icon="el-icon-plus" 37 icon="el-icon-plus"
38 size="mini" 38 size="mini"
39 - @click="$router.push({ name: 'FlightAllocConfigInfo', params: { handle: 'add' } })" 39 + @click="$router.push({ name: 'FlightAllocConfigAdd', params: { handle: 'add' } })"
40 >添加</el-button 40 >添加</el-button
41 > 41 >
42 </div> 42 </div>
......
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,41 +435,78 @@ export default { ...@@ -428,41 +435,78 @@ 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 + // );
451 + },
452 +
453 + removes(){
454 + if(this.routeName == "FlightAllocConfigAdd"){
455 + sessionStorage.setItem("flightAdd","remove")
456 + }else{
457 + sessionStorage.setItem("flightInfo"+this.dataId,"remove")
458 + }
442 }, 459 },
460 +
461 + async dictData(){
462 + allDictData().then((response) => {
463 + if (response.code != 200) {
464 + this.$message({
465 + showClose: true,
466 + message: response.msg,
467 + type: "error",
468 + });
469 + return;
470 + }
471 + let dict = response.data;
472 + this.cargoType = dict.cargoType;
473 + this.cargoStatus = dict.cargoStatus;
474 + this.serviceCode = dict.serviceCode.sort((a, b) =>
475 + a.englishName.localeCompare(b.englishName)
476 + );
477 +
478 + this.handlingCode = this.sorttodo(dict.handlingCode, "BLANK");
479 + this.subCategory = dict.subCategory;
480 + });
481 + }
443 }, 482 },
444 - created() {
445 - let handle = this.$route.params.handle;
446 483
447 - allDictData().then((response) => { 484 + beforeDestroy(){
448 - if (response.code != 200) { 485 + if(this.routeName == "FlightAllocConfigAdd"){
449 - this.$message({ 486 + if(sessionStorage.getItem("flightAdd") == "remove"){
450 - showClose: true, 487 + sessionStorage.removeItem("flightAdd")
451 - message: response.msg, 488 + }else{
452 - type: "error", 489 + this.form.isNeedRequired = this.isNeedRequired
453 - }); 490 + sessionStorage.setItem("flightAdd",JSON.stringify(this.form))
454 - return;
455 } 491 }
456 - let dict = response.data; 492 + }else{
457 - this.cargoType = dict.cargoType; 493 + if(sessionStorage.getItem("flightInfo"+this.dataId) == "remove"){
458 - this.cargoStatus = dict.cargoStatus; 494 + sessionStorage.removeItem("flightInfo"+this.dataId)
459 - this.serviceCode = dict.serviceCode.sort((a, b) => 495 + }else{
460 - a.englishName.localeCompare(b.englishName) 496 + if(this.handleName == "detail"){
461 - ); 497 + this.form.isNeedRequired = this.isNeedRequired
498 + sessionStorage.setItem("flightInfo"+this.dataId,JSON.stringify(this.form))
499 + }
500 + }
501 + }
502 + },
462 503
463 - this.handlingCode = this.sorttodo(dict.handlingCode, "BLANK"); 504 + created() {
464 - this.subCategory = dict.subCategory; 505 + let handle = this.$route.params.handle;
465 - }); 506 + this.routeName = this.$route.name;
507 + this.dataId = this.$route.params.id;
508 + this.handleName = this.$route.params.handle;
509 + this.dictData()
466 if (handle === "detail") { 510 if (handle === "detail") {
467 this.disable = true; 511 this.disable = true;
468 } 512 }
...@@ -470,8 +514,17 @@ export default { ...@@ -470,8 +514,17 @@ export default {
470 if (handle != "add") { 514 if (handle != "add") {
471 this.nameDisabled = true; 515 this.nameDisabled = true;
472 let id = this.$route.params.id; 516 let id = this.$route.params.id;
473 - 517 + if(sessionStorage.getItem("flightInfo"+id) && this.$route.name == "FlightAllocConfigInfo" && handle != "detail"){
474 - if (isNaN(Number(id))) { 518 + this.loading = false
519 + this.form = JSON.parse(sessionStorage.getItem("flightInfo"+this.$route.params.id))
520 + this.isNeedRequired = this.form.isNeedRequired;
521 + if(this.form.notLocation != null || this.form.notLocation == ""){
522 + this.isLocation = "2";
523 + }else{
524 + this.isLocation = "1";
525 + }
526 + }else{
527 + if (isNaN(Number(id))) {
475 findDestinationFltRuleByActualFlight(id).then((response) => { 528 findDestinationFltRuleByActualFlight(id).then((response) => {
476 if (response.code != 200) { 529 if (response.code != 200) {
477 this.$message({ 530 this.$message({
...@@ -512,46 +565,58 @@ export default { ...@@ -512,46 +565,58 @@ export default {
512 } else { 565 } else {
513 //货物信息 566 //货物信息
514 findByFlightId(id).then((response) => { 567 findByFlightId(id).then((response) => {
515 - if (response.code != 200) { 568 + if (response.code != 200) {
516 - this.$message({ 569 + this.$message({
517 - showClose: true, 570 + showClose: true,
518 - message: response.msg, 571 + message: response.msg,
519 - type: "error", 572 + type: "error",
520 - }); 573 + });
521 - this.isEmpty = true; 574 + 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 { 575 } else {
543 - this.isLocation = "1"; 576 + let info = response.data.list;
577 + info.typeOfGoods = info.typeOfGoods
578 + ? info.typeOfGoods.split(";")
579 + : [];
580 + info.declarationCategory = info.declarationCategory
581 + ? info.declarationCategory.split(";")
582 + : [];
583 + info.serviceCode = info.serviceCode
584 + ? info.serviceCode.split(";")
585 + : [];
586 + info.handlingCode = info.handlingCode
587 + ? info.handlingCode.split(";")
588 + : [];
589 + info.subCategory = info.subCategory
590 + ? info.subCategory.split(";")
591 + : [];
592 + this.form = info;
593 + if (info.notLocation != null || info.notLocation == "") {
594 + this.isLocation = "2";
595 + } else {
596 + this.isLocation = "1";
597 + }
598 + let isNeedRequired = response.data.isNeedRequired;
599 + this.form.isNeedRequired = isNeedRequired;
600 + this.isNeedRequired = isNeedRequired;
544 } 601 }
545 - let isNeedRequired = response.data.isNeedRequired; 602 + this.loading = false;
546 - this.form.isNeedRequired = isNeedRequired; 603 + });
547 - this.isNeedRequired = isNeedRequired; 604 + }
548 - }
549 - this.loading = false;
550 - });
551 } 605 }
552 } else { 606 } else {
553 this.loading = false; 607 this.loading = false;
554 } 608 }
609 + if(this.$route.name == "FlightAllocConfigAdd"){
610 + if(sessionStorage.getItem("flightAdd")){
611 + this.form = JSON.parse(sessionStorage.getItem("flightAdd"))
612 + this.isNeedRequired = this.form.isNeedRequired;
613 + if(this.form.notLocation != null || this.form.notLocation == ""){
614 + this.isLocation = "2";
615 + }else{
616 + this.isLocation = "1";
617 + }
618 + }
619 + }
555 }, 620 },
556 computed: { 621 computed: {
557 minNumOfPieces: { 622 minNumOfPieces: {
......
...@@ -122,26 +122,23 @@ ...@@ -122,26 +122,23 @@
122 label="运单号" 122 label="运单号"
123 align="center" 123 align="center"
124 prop="waybillNo" 124 prop="waybillNo"
125 - width="120"
126 /> 125 />
127 <el-table-column 126 <el-table-column
127 + :show-overflow-tooltip="true"
128 label="品牌描述" 128 label="品牌描述"
129 align="center" 129 align="center"
130 prop="nameDescription" 130 prop="nameDescription"
131 - width="120"
132 /> 131 />
133 <el-table-column 132 <el-table-column
134 label="航班日期" 133 label="航班日期"
135 align="center" 134 align="center"
136 prop="fltDate" 135 prop="fltDate"
137 - width="130"
138 /> 136 />
139 - <el-table-column label="航班号" align="center" prop="fltNo" /> 137 + <el-table-column label="航班号" align="center" prop="fltNo" width="100"/>
140 <el-table-column 138 <el-table-column
141 label="航班路线" 139 label="航班路线"
142 align="center" 140 align="center"
143 prop="route" 141 prop="route"
144 - width="150"
145 /> 142 />
146 <el-table-column 143 <el-table-column
147 label="配置航班类型" 144 label="配置航班类型"
...@@ -149,9 +146,9 @@ ...@@ -149,9 +146,9 @@
149 prop="kindName" 146 prop="kindName"
150 width="130" 147 width="130"
151 /> 148 />
152 - <el-table-column label="尺寸" align="center" prop="sizeStr" /> 149 + <el-table-column label="尺寸" align="center" prop="sizeStr" width="70"/>
153 - <el-table-column label="件数" align="center" prop="qty" /> 150 + <el-table-column label="件数" align="center" prop="qty" width="70"/>
154 - <el-table-column label="实际重量" align="center" prop="actualWeight" /> 151 + <el-table-column label="实际重量" align="center" prop="actualWeight" width="100"/>
155 <el-table-column 152 <el-table-column
156 label="创建时间" 153 label="创建时间"
157 align="center" 154 align="center"
...@@ -174,7 +171,7 @@ ...@@ -174,7 +171,7 @@
174 import { findCagroPreData } from "@/api/cargoSelect"; 171 import { findCagroPreData } from "@/api/cargoSelect";
175 import { cargoXlsxPre } from "@/utils/zipdownload"; 172 import { cargoXlsxPre } from "@/utils/zipdownload";
176 export default { 173 export default {
177 - name: "caExportPreQualification", 174 + name: "CAPreQualificationExport",
178 data() { 175 data() {
179 return { 176 return {
180 //导出 177 //导出
...@@ -258,6 +255,12 @@ export default { ...@@ -258,6 +255,12 @@ export default {
258 this.tableData = response.data.list; 255 this.tableData = response.data.list;
259 this.total = response.data.totalCount; 256 this.total = response.data.totalCount;
260 this.loading = false; 257 this.loading = false;
258 + if(response.data.list.length == 0){
259 + this.$message({
260 + message: "未查询到数据",
261 + type: "warning",
262 + });
263 + }
261 } else { 264 } else {
262 this.msgError(response.msg); 265 this.msgError(response.msg);
263 } 266 }
......
...@@ -70,13 +70,13 @@ ...@@ -70,13 +70,13 @@
70 </el-button> 70 </el-button>
71 </el-col> 71 </el-col>
72 </el-row> --> 72 </el-row> -->
73 - <el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="findAllFltDatList" 73 + <el-table max-height="550" highlight-current-row border stripe v-loading="loading" :data="findAllFltDatList" size="mini"
74 @selection-change="handleSelectionChange"> 74 @selection-change="handleSelectionChange">
75 <el-table-column type="selection" width="55" align="center" /> 75 <el-table-column type="selection" width="55" align="center" />
76 <el-table-column label="航班日期" align="center" prop="fltDate" width="120" /> 76 <el-table-column label="航班日期" align="center" prop="fltDate" width="120" />
77 <el-table-column label="航班起飞时间" align="center" prop="takeOffTime" width="120" /> 77 <el-table-column label="航班起飞时间" align="center" prop="takeOffTime" width="120" />
78 <el-table-column label="航班号" align="center" prop="fltNo" /> 78 <el-table-column label="航班号" align="center" prop="fltNo" />
79 - <el-table-column label="航班路线" align="center" prop="route" /> 79 + <el-table-column label="航班路线" align="center" prop="route" width="150" />
80 <el-table-column label="航班类型" align="center" prop="typeName" width="100" /> 80 <el-table-column label="航班类型" align="center" prop="typeName" width="100" />
81 <el-table-column label="航班种类" align="center" prop="flightKindName" width="130" /> 81 <el-table-column label="航班种类" align="center" prop="flightKindName" width="130" />
82 <el-table-column label="航班状态" align="center" prop="statusName" /> 82 <el-table-column label="航班状态" align="center" prop="statusName" />
......
...@@ -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) {
......