diff --git a/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue b/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue index 11bec8f9..07e3f377 100644 --- a/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue +++ b/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue @@ -7,11 +7,14 @@ - - + + + + + @@ -28,6 +31,9 @@ + + 查询时间对比 + @@ -74,58 +80,184 @@ + + + - - - + + + + - + + + + + + - + + + - - + + + + + + - @@ -166,7 +298,8 @@ export default { showSearch: true, // 创建时间搜索 dateTimeRange:[], - + // 对比时间 + dateTimeRangeCompare:[], // 总条数 total: 0, recordTotal:0, @@ -202,7 +335,7 @@ export default { id:null, titleView:"", openView: false, - + statType:false, // 查询参数 queryParams: { pageNum: 1, @@ -247,6 +380,12 @@ export default { initQueryParams(){ let thisQueryParams = {...this.queryParams}; thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRange,"SendDate"); + thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRangeCompare,"CompareDate"); + if(this.statType == true){ + thisQueryParams.params.statType = 3; + }else{ + thisQueryParams.params.statType = 1; + } return thisQueryParams; }, @@ -643,4 +782,25 @@ export default { vertical-align: top; white-space: nowrap; } + .flex-center{ + display: flex; + align-items: center; + width: 90%; + margin: 0 auto; + } + .icon-content{ + margin-left: 10px; + margin-left: auto; + font-size: 18px; + font-weight: bold; + } + .el-icon-right{ + color: #409EFF; + } + .el-icon-top{ + color: #dd0c1e; + } + .el-icon-bottom{ + color: #12da33; + } diff --git a/src/views/emis/emisCustomerUser/monthlyShipmentStatReceiveCountryQuery.vue b/src/views/emis/emisCustomerUser/monthlyShipmentStatReceiveCountryQuery.vue index f313e9e1..504459e1 100644 --- a/src/views/emis/emisCustomerUser/monthlyShipmentStatReceiveCountryQuery.vue +++ b/src/views/emis/emisCustomerUser/monthlyShipmentStatReceiveCountryQuery.vue @@ -4,14 +4,17 @@ - + - - - + + + + + + @@ -28,6 +31,9 @@ + + 查询时间对比 + @@ -74,74 +80,236 @@ + + + - - + + + - + + + - + + + + + + - + + + - + + + - + + + - + + + - @@ -182,7 +350,8 @@ export default { showSearch: true, // 创建时间搜索 dateTimeRange:[], - + // 对比时间 + dateTimeRangeCompare:[], // 总条数 total: 0, recordTotal:0, @@ -218,7 +387,7 @@ export default { id:null, titleView:"", openView: false, - + statType:false, // 查询参数 queryParams: { pageNum: 1, @@ -263,6 +432,12 @@ export default { initQueryParams(){ let thisQueryParams = {...this.queryParams}; thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRange,"SendDate"); + thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRangeCompare,"CompareDate"); + if(this.statType == true){ + thisQueryParams.params.statType = 4; + }else{ + thisQueryParams.params.statType = 2; + } return thisQueryParams; }, @@ -712,4 +887,25 @@ export default { vertical-align: top; white-space: nowrap; } + .flex-center{ + display: flex; + align-items: center; + width: 90%; + margin: 0 auto; + } + .icon-content{ + margin-left: 10px; + margin-left: auto; + font-size: 18px; + font-weight: bold; + } + .el-icon-right{ + color: #409EFF; + } + .el-icon-top{ + color: #dd0c1e; + } + .el-icon-bottom{ + color: #12da33; + }