Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
f3585e4f 1 parent 38a6838a

样式修改，提示语增加

Inline Side-by-side
Showing 4 changed files with 174 additions and 169 deletions
...@@ -142,10 +142,10 @@ ...@@ -142,10 +142,10 @@
142 </el-col> 142 </el-col>
143 <el-col :span="24"> 143 <el-col :span="24">
144 <el-form-item label="Handling Code"> 144 <el-form-item label="Handling Code">
145 - <el-empty description="暂无数据" v-if=" 145 + <!-- <el-empty description="暂无数据" v-if="
146 !selectData.HandlingCode || selectData.HandlingCode.length == 0 146 !selectData.HandlingCode || selectData.HandlingCode.length == 0
147 - "></el-empty> 147 + "></el-empty> -->
148 - <el-checkbox-group v-model="handingCodes" v-else> 148 + <el-checkbox-group v-model="handingCodes">
149 <el-row> 149 <el-row>
150 <el-col :span="2" v-for="item in selectData.HandlingCode" :key="item.id"> 150 <el-col :span="2" v-for="item in selectData.HandlingCode" :key="item.id">
151 <el-checkbox :label="item.chineseName" v-model="item.chineseName"> 151 <el-checkbox :label="item.chineseName" v-model="item.chineseName">
...@@ -158,10 +158,10 @@ ...@@ -158,10 +158,10 @@
158 </el-col> 158 </el-col>
159 <el-col :span="24"> 159 <el-col :span="24">
160 <el-form-item label="Sub Category"> 160 <el-form-item label="Sub Category">
161 - <el-empty description="暂无数据" v-if=" 161 + <!-- <el-empty description="暂无数据" v-if="
162 !selectData.SubCategory || selectData.SubCategory.length == 0 162 !selectData.SubCategory || selectData.SubCategory.length == 0
163 - "></el-empty> 163 + "></el-empty> -->
164 - <el-checkbox-group v-model="subCategorys" v-else> 164 + <el-checkbox-group v-model="subCategorys">
165 <el-row> 165 <el-row>
166 <el-col :span="2" v-for="item in selectData.SubCategory" :key="item.id"> 166 <el-col :span="2" v-for="item in selectData.SubCategory" :key="item.id">
167 <el-checkbox :label="item.chineseName" v-model="item.chineseName"> 167 <el-checkbox :label="item.chineseName" v-model="item.chineseName">
...@@ -178,12 +178,12 @@ ...@@ -178,12 +178,12 @@
178 <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" 178 <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
179 v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading" 179 v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading"
180 :disabled="tableData.length <= 0">{{ 180 :disabled="tableData.length <= 0">{{
181 - downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果" 181 + downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
182 }}</el-button> 182 }}</el-button>
183 <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" 183 <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
184 v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading" 184 v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading"
185 :disabled="tableData.length <= 0">{{ 185 :disabled="tableData.length <= 0">{{
186 - downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果" 186 + downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
187 }}</el-button> 187 }}</el-button>
188 <el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit" 188 <el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit"
189 :disabled="tableSelection.length <= 0">添加到航班</el-button> 189 :disabled="tableSelection.length <= 0">添加到航班</el-button>
......
...@@ -69,20 +69,20 @@ export default { ...@@ -69,20 +69,20 @@ export default {
69 overweight: false, 69 overweight: false,
70 }, 70 },
71 cargoHeader: [ 71 cargoHeader: [
72 - { name: "口岸代码", value: "portName" }, 72 + { name: "口岸代码", value: "portName", width: "" },
73 - { name: "运单号", value: "waybillNo" }, 73 + { name: "运单号", value: "waybillNo", width: "" },
74 - { name: "货物状态", value: "statusName" }, 74 + { name: "货物状态", value: "statusName" , width: ""},
75 - { name: "站点", value: "siteName" }, 75 + { name: "站点", value: "siteName", width: "" },
76 - { name: "申报类型", value: "typeName" }, 76 + { name: "申报类型", value: "typeName", width: "" },
77 - { name: "URSA", value: "ursa" }, 77 + { name: "URSA", value: "ursa", width: "" },
78 - { name: "实际重量", value: "actualWeight" }, 78 + { name: "实际重量", value: "actualWeight", width: "" },
79 - { name: "件数", value: "qty" }, 79 + { name: "件数", value: "qty", width: "" },
80 - { name: "ACCS原航班号", value: "fltNoAccs" }, 80 + { name: "ACCS原航班号", value: "fltNoAccs", width: "120" },
81 - { name: "ACCS原航班日期", value: "fltDateAccs" }, 81 + { name: "ACCS原航班日期", value: "fltDateAccs", width: "130" },
82 - { name: "品名描述", value: "nameDescription" }, 82 + { name: "品名描述", value: "nameDescription" , width: ""},
83 - { name: "是否自动", value: "cargoRulesStatus" }, 83 + { name: "是否自动", value: "cargoRulesStatus" , width: ""},
84 - { name: "创建人", value: "createUserName" }, 84 + { name: "创建人", value: "createUserName", width: "" },
85 - { name: "创建时间", value: "createTime" }, 85 + { name: "创建时间", value: "createTime", width: "" },
86 ], 86 ],
87 routeList: [], 87 routeList: [],
88 rules: { 88 rules: {
......
...@@ -640,18 +640,43 @@ export default { ...@@ -640,18 +640,43 @@ export default {
640 if (this.$route.params.handle != 'add') { 640 if (this.$route.params.handle != 'add') {
641 findDestinationFltRuleByFlightNo(obj).then(res => { 641 findDestinationFltRuleByFlightNo(obj).then(res => {
642 if (res.code === 200) { 642 if (res.code === 200) {
643 - this.routeList = res.data.routeList 643 + if (res.data.routeList.length <= 0) {
644 - if (res.data.list.length > 0) { 644 + this.msgWarning('未查询到航线信息！')
645 - //请求到数据 645 + } else {
646 - if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') { 646 + this.routeList = res.data.routeList
647 - //航线不为空，对应到这条航线下的这条维度(直接处理插入数据) 647 + if (res.data.list.length > 0) {
648 - if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') { 648 + //请求到数据
649 - //如果是从航班维护界面跳转且航班类型为White Tail则直接显示当前航线维度 649 + if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
650 - res.data.list.forEach(item => { 650 + //航线不为空，对应到这条航线下的这条维度(直接处理插入数据)
651 - this.infoForm.list.push(this.dataHandle(item)) 651 + if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
652 - }) 652 + //如果是从航班维护界面跳转且航班类型为White Tail则直接显示当前航线维度
653 + res.data.list.forEach(item => {
654 + this.infoForm.list.push(this.dataHandle(item))
655 + })
656 + } else {
657 + //航班类型为Purple Tail则显示所有航线维度
658 + this.routeList.forEach(route => {
659 + let routeStatus = 1
660 + res.data.list.forEach(item => {
661 + if (route.route === item.flightRoute) {
662 + //航线对应插入数据
663 + routeStatus = 2
664 + this.infoForm.list.push(this.dataHandle(item))
665 + }
666 + })
667 + if (routeStatus == 1) {
668 + //否则插入占位基础数据
669 + this.infoForm.list.push({
670 + purposeOfFlightNo: this.infoForm.fltNo,
671 + ruleDate: this.infoForm.fltDate,
672 + flightRoute: route.route,
673 + routePriority: route.routePriority,
674 + })
675 + }
676 + })
677 + }
653 } else { 678 } else {
654 - //航班类型为Purple Tail则显示所有航线维度 679 + //航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
655 this.routeList.forEach(route => { 680 this.routeList.forEach(route => {
656 let routeStatus = 1 681 let routeStatus = 1
657 res.data.list.forEach(item => { 682 res.data.list.forEach(item => {
...@@ -673,151 +698,130 @@ export default { ...@@ -673,151 +698,130 @@ export default {
673 }) 698 })
674 } 699 }
675 } else { 700 } else {
676 - //航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度） 701 + //未请求到数据
677 - this.routeList.forEach(route => { 702 + if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
678 - let routeStatus = 1 703 + //航线不为空，获取该航线下无日期通用维度设置
679 - res.data.list.forEach(item => { 704 + findDestinationFltRuleByFlightNo({
680 - if (route.route === item.flightRoute) { 705 + purposeOfFlightNo: this.infoForm.fltNo,
681 - //航线对应插入数据 706 + flightRoute: this.infoForm.route,
682 - routeStatus = 2 707 + status: this.$route.params.status
683 - this.infoForm.list.push(this.dataHandle(item)) 708 + }).then(response => {
684 - } 709 + if (response.data.list.length > 0) {
685 - }) 710 + //查询到通用维度，去除id status，航线赋值，航线优先级赋值
686 - if (routeStatus == 1) { 711 + if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
687 - //否则插入占位基础数据 712 + //航班类型White Tail只展示当前航线维度
688 - this.infoForm.list.push({ 713 + response.data.list.forEach(item => {
689 - purposeOfFlightNo: this.infoForm.fltNo, 714 + item.id = undefined
690 - ruleDate: this.infoForm.fltDate, 715 + item.status = undefined
691 - flightRoute: route.route, 716 + item.flightRoute = this.infoForm.route
692 - routePriority: route.routePriority, 717 + this.routeList.forEach(route => {
693 - }) 718 + if (route.route === this.infoForm.route) {
694 - } 719 + item.routePriority = route.routePriority
695 - }) 720 + }
696 - } 721 + })
697 - } else { 722 + this.infoForm.list.push(this.dataHandle(item))
698 - //未请求到数据 723 + })
699 - if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') { 724 + } else {
700 - //航线不为空，获取该航线下无日期通用维度设置 725 + //航班类型Purple Tail展示全部航线维度
701 - findDestinationFltRuleByFlightNo({ 726 + let routesStatus = 1
702 - purposeOfFlightNo: this.infoForm.fltNo,
703 - flightRoute: this.infoForm.route,
704 - status: this.$route.params.status
705 - }).then(response => {
706 - if (response.data.list.length > 0) {
707 - //查询到通用维度，去除id status，航线赋值，航线优先级赋值
708 - if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
709 - //航班类型White Tail只展示当前航线维度
710 - response.data.list.forEach(item => {
711 - item.id = undefined
712 - item.status = undefined
713 - item.flightRoute = this.infoForm.route
714 this.routeList.forEach(route => { 727 this.routeList.forEach(route => {
715 - if (route.route === this.infoForm.route) { 728 + response.data.list.forEach(item => {
716 - item.routePriority = route.routePriority 729 + if (route.route === item.flightRoute) {
730 + routesStatus = 2
731 + item.id = undefined
732 + item.status = undefined
733 + item.flightRoute = this.infoForm.route
734 + item.routePriority = route.routePriority
735 + this.infoForm.list.push(this.dataHandle(item))
736 + }
737 + })
738 + if (routesStatus == 1) {
739 + this.infoForm.list.push({
740 + purposeOfFlightNo: this.infoForm.fltNo,
741 + ruleDate: this.infoForm.fltDate,
742 + flightRoute: route.route,
743 + routePriority: route.routePriority,
744 + })
717 } 745 }
718 }) 746 })
719 - this.infoForm.list.push(this.dataHandle(item)) 747 + }
720 - })
721 } else { 748 } else {
722 - //航班类型Purple Tail展示全部航线维度 749 + //未查询到,插入占位基础数据使用户新建
723 - let routesStatus = 1 750 + if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
724 - this.routeList.forEach(route => { 751 + //航班类型White Tail只展示当前航线维度
725 - response.data.list.forEach(item => { 752 + this.routeList.forEach((item) => {
726 - if (route.route === item.flightRoute) { 753 + if (item.route === this.infoForm.route) {
727 - routesStatus = 2 754 + this.infoForm.list.push({
728 - item.id = undefined 755 + purposeOfFlightNo: this.infoForm.fltNo,
729 - item.status = undefined 756 + ruleDate: this.infoForm.fltDate,
730 - item.flightRoute = this.infoForm.route 757 + flightRoute: this.infoForm.route,
731 - item.routePriority = route.routePriority 758 + routePriority: item.routePriority,
732 - this.infoForm.list.push(this.dataHandle(item)) 759 + })
733 } 760 }
734 }) 761 })
735 - if (routesStatus == 1) { 762 + } else {
763 + //航班类型Purple Tail展示全部航线维度
764 + // this.isEmpty = true
765 + this.routeList.forEach((route) => {
736 this.infoForm.list.push({ 766 this.infoForm.list.push({
737 purposeOfFlightNo: this.infoForm.fltNo, 767 purposeOfFlightNo: this.infoForm.fltNo,
738 ruleDate: this.infoForm.fltDate, 768 ruleDate: this.infoForm.fltDate,
739 flightRoute: route.route, 769 flightRoute: route.route,
740 routePriority: route.routePriority, 770 routePriority: route.routePriority,
741 }) 771 })
742 - }
743 - })
744 - }
745 - } else {
746 - //未查询到,插入占位基础数据使用户新建
747 - if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
748 - //航班类型White Tail只展示当前航线维度
749 - this.routeList.forEach((item) => {
750 - if (item.route === this.infoForm.route) {
751 - this.infoForm.list.push({
752 - purposeOfFlightNo: this.infoForm.fltNo,
753 - ruleDate: this.infoForm.fltDate,
754 - flightRoute: this.infoForm.route,
755 - routePriority: item.routePriority,
756 - })
757 - }
758 - })
759 - } else {
760 - //航班类型Purple Tail展示全部航线维度
761 - // this.isEmpty = true
762 - this.routeList.forEach((route) => {
763 - this.infoForm.list.push({
764 - purposeOfFlightNo: this.infoForm.fltNo,
765 - ruleDate: this.infoForm.fltDate,
766 - flightRoute: route.route,
767 - routePriority: route.routePriority,
768 }) 772 })
769 - }) 773 + }
770 } 774 }
771 - } 775 + }).catch(err => {
772 - }).catch(err => { 776 + this.isEmpty = true
773 - this.isEmpty = true 777 + console.log(err)
774 - console.log(err) 778 + })
775 - }) 779 + } else {
776 - } else { 780 + //航线为空，提示未找到维度数据
777 - //航线为空，提示未找到维度数据 781 + if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
778 - if (this.routeSatus == 'flightInformationMaintenancePurple Tail') { 782 + findDestinationFltRuleByFlightNo({
779 - findDestinationFltRuleByFlightNo({ 783 + purposeOfFlightNo: this.infoForm.fltNo,
780 - purposeOfFlightNo: this.infoForm.fltNo, 784 + flightRoute: this.infoForm.route,
781 - flightRoute: this.infoForm.route, 785 + status: this.$route.params.status
782 - status: this.$route.params.status 786 + }).then(response => {
783 - }).then(response => { 787 + if (response.data.list.length > 0) {
784 - if (response.data.list.length > 0) { 788 + this.routeList.forEach(route => {
785 - this.routeList.forEach(route => { 789 + let routeStatus = 1
786 - let routeStatus = 1 790 + response.data.list.forEach(item => {
787 - response.data.list.forEach(item => { 791 + if (item.flightRoute == route.route) {
788 - if (item.flightRoute == route.route) { 792 + routeStatus = 2
789 - routeStatus = 2 793 + item.id = undefined
790 - item.id = undefined 794 + item.status = undefined
791 - item.status = undefined 795 + item.routePriority = route.routePriority
792 - item.routePriority = route.routePriority 796 + this.infoForm.list.push(
793 - this.infoForm.list.push( 797 + this.dataHandle(item)
794 - this.dataHandle(item) 798 + )
795 - ) 799 + }
800 + })
801 + if (routeStatus == 1) {
802 + this.infoForm.list.push({
803 + purposeOfFlightNo: this.infoForm.fltNo,
804 + ruleDate: this.infoForm.fltDate,
805 + flightRoute: route.route,
806 + routePriority: route.routePriority,
807 + })
796 } 808 }
797 }) 809 })
798 - if (routeStatus == 1) { 810 + } else {
811 + this.routeList.forEach((route) => {
799 this.infoForm.list.push({ 812 this.infoForm.list.push({
800 purposeOfFlightNo: this.infoForm.fltNo, 813 purposeOfFlightNo: this.infoForm.fltNo,
801 ruleDate: this.infoForm.fltDate, 814 ruleDate: this.infoForm.fltDate,
802 flightRoute: route.route, 815 flightRoute: route.route,
803 routePriority: route.routePriority, 816 routePriority: route.routePriority,
804 }) 817 })
805 - }
806 - })
807 - } else {
808 - this.routeList.forEach((route) => {
809 - this.infoForm.list.push({
810 - purposeOfFlightNo: this.infoForm.fltNo,
811 - ruleDate: this.infoForm.fltDate,
812 - flightRoute: route.route,
813 - routePriority: route.routePriority,
814 }) 818 })
815 - }) 819 + }
816 - } 820 + }).catch(err => {
817 - }).catch(err => { 821 + this.isEmpty = true
818 - this.isEmpty = true 822 + console.log(err)
819 - console.log(err) 823 + })
820 - }) 824 + }
821 } 825 }
822 } 826 }
823 } 827 }
...@@ -849,6 +853,7 @@ export default { ...@@ -849,6 +853,7 @@ export default {
849 }) 853 })
850 }) 854 })
851 } else { 855 } else {
856 + this.msgWarning('未查询到航线信息！')
852 this.routeList = [] 857 this.routeList = []
853 this.infoForm.list = [] 858 this.infoForm.list = []
854 } 859 }
......
...@@ -69,20 +69,20 @@ export default { ...@@ -69,20 +69,20 @@ export default {
69 overweight: false, 69 overweight: false,
70 }, 70 },
71 cargoHeader: [ 71 cargoHeader: [
72 - { name: "口岸代码", value: "portName" }, 72 + { name: "口岸代码", value: "portName", width: "" },
73 - { name: "运单号", value: "waybillNo" }, 73 + { name: "运单号", value: "waybillNo", width: "" },
74 - { name: "货物状态", value: "statusName" }, 74 + { name: "货物状态", value: "statusName" , width: ""},
75 - { name: "站点", value: "siteName" }, 75 + { name: "站点", value: "siteName", width: "" },
76 - { name: "申报类型", value: "typeName" }, 76 + { name: "申报类型", value: "typeName", width: "" },
77 - { name: "URSA", value: "ursa" }, 77 + { name: "URSA", value: "ursa", width: "" },
78 - { name: "实际重量", value: "actualWeight" }, 78 + { name: "实际重量", value: "actualWeight", width: "" },
79 - { name: "件数", value: "qty" }, 79 + { name: "件数", value: "qty", width: "" },
80 - { name: "ACCS原航班号", value: "fltNoAccs" }, 80 + { name: "ACCS原航班号", value: "fltNoAccs", width: "120" },
81 - { name: "ACCS原航班日期", value: "fltDateAccs" }, 81 + { name: "ACCS原航班日期", value: "fltDateAccs", width: "130" },
82 - { name: "品名描述", value: "nameDescription" }, 82 + { name: "品名描述", value: "nameDescription" , width: ""},
83 - { name: "是否自动", value: "cargoRulesStatus" }, 83 + { name: "是否自动", value: "cargoRulesStatus" , width: ""},
84 - { name: "创建人", value: "createUserName" }, 84 + { name: "创建人", value: "createUserName", width: "" },
85 - { name: "创建时间", value: "createTime" }, 85 + { name: "创建时间", value: "createTime", width: "" },
86 ], 86 ],
87 routeList: [], 87 routeList: [],
88 rules: { 88 rules: {
......