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 @@
display: none;
}
.el-table--mini th, .el-table--mini td{
padding: 12px 0 !important;
padding: 9px 0 !important;
}
.el-table th, .el-table td {
padding: 12px 0 !important;
padding: 9px 0 !important;
}
......
......@@ -1034,7 +1034,16 @@ export default {
this.msgWarning('件数前区间不能大于后区间')
} else if (new Number(data.minWeight) > new Number(data.maxWeight)) {
this.msgWarning('重量前区间不能大于后区间')
} 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 == '')) {
} else if (
data.handlingCode == '' && data.serviceCode == ''
&& data.subCategory == '' && data.typeOfGoods == ''
&& data.puporpuxCode == '' && (data.location == null || data.location == '')
&& data.notLocation == '' && (data.destinationSite == null || 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 == '')) {
this.msgWarning('未添加规则信息，请添加后再保存!')
} else {
// this.loading = true
......