Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
85ea5627 2 parents b3ef0254 72bcfea7

Merge branch 'test' into uat

Inline Side-by-side
Showing 2 changed files with 12 additions and 3 deletions
...@@ -91,8 +91,8 @@ ...@@ -91,8 +91,8 @@
91 display: none; 91 display: none;
92 } 92 }
93 .el-table--mini th, .el-table--mini td{ 93 .el-table--mini th, .el-table--mini td{
94 - padding: 12px 0 !important; 94 + padding: 9px 0 !important;
95 } 95 }
96 .el-table th, .el-table td { 96 .el-table th, .el-table td {
97 - padding: 12px 0 !important; 97 + padding: 9px 0 !important;
98 } 98 }
......
...@@ -1034,7 +1034,16 @@ export default { ...@@ -1034,7 +1034,16 @@ export default {
1034 this.msgWarning('件数前区间不能大于后区间') 1034 this.msgWarning('件数前区间不能大于后区间')
1035 } else if (new Number(data.minWeight) > new Number(data.maxWeight)) { 1035 } else if (new Number(data.minWeight) > new Number(data.maxWeight)) {
1036 this.msgWarning('重量前区间不能大于后区间') 1036 this.msgWarning('重量前区间不能大于后区间')
1037 - } else if (data.handlingCode == '' && data.serviceCode == '' && data.subCategory == '' && data.typeOfGoods == '' && data.puporpuxCode == '' && (!data.location || data.location == '') && data.notLocation == '' && (!data.destinationSite || data.destinationSite == '') && data.notDestinationSite && (data.includeUrsa == null || data.includeUrsa == '') && (data.notIncludeUrsa == null || data.notIncludeUrsa == '') && (!data.minNumOfPieces || data.minNumOfPieces == '') && (!data.maxNumOfPieces || data.maxNumOfPieces == '') && (!data.minWeight || data.minWeight == '') && (!data.maxWeight || data.maxWeight == '')) { 1037 + } else if (
1038 + data.handlingCode == '' && data.serviceCode == ''
1039 + && data.subCategory == '' && data.typeOfGoods == ''
1040 + && data.puporpuxCode == '' && (data.location == null || data.location == '')
1041 + && data.notLocation == '' && (data.destinationSite == null || data.destinationSite == '')
1042 + && data.notDestinationSite == '' && (data.includeUrsa == null || data.includeUrsa == '')
1043 + && (data.notIncludeUrsa == null || data.notIncludeUrsa == '')
1044 + && (!data.minNumOfPieces || data.minNumOfPieces == '')
1045 + && (!data.maxNumOfPieces || data.maxNumOfPieces == '') &&
1046 + (!data.minWeight || data.minWeight == '') && (!data.maxWeight || data.maxWeight == '')) {
1038 this.msgWarning('未添加规则信息，请添加后再保存!') 1047 this.msgWarning('未添加规则信息，请添加后再保存!')
1039 } else { 1048 } else {
1040 // this.loading = true 1049 // this.loading = true
......