diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue index ca4441c..f89ad86 100644 --- a/src/views/modules/eam/eamWorkOrderForCheck.vue +++ b/src/views/modules/eam/eamWorkOrderForCheck.vue @@ -377,6 +377,7 @@ planDate: new Date(), page: 1, limit: 10, + searchType: 'checkOrder' }, height: 200, pageIndex: 1, @@ -982,7 +983,7 @@ }, // 重置查询时间 - searchClick(){ + searchClick () { this.searchData.planDate = '' this.getDataList() }, diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue index e5a4857..fddd3fc 100644 --- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue +++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue @@ -425,6 +425,7 @@ page: 1, planDate: new Date(), limit: 10, + searchType: 'maintenanceOrder' }, height: 200, pageIndex: 1, diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index 435b182..146e16f 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -59,6 +59,7 @@ + + - - - @@ -237,6 +236,16 @@ + + + + @@ -422,6 +432,7 @@ endDate: '', page: 1, limit: 10, + searchType: 'reportCheck' }, height: 200, pageIndex: 1, @@ -1074,7 +1085,7 @@ } }, // 重置查询时间 - searchClick(){ + searchClick () { this.searchData.planDate = '' this.getDataList() }, @@ -1092,7 +1103,7 @@ this.dataListLoading = false }) }, - //导出excel + // 导出excel async createExportData() { this.searchData.limit = -1 this.searchData.page = 1 @@ -1185,7 +1196,7 @@ return } if(this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue != '' && this.detailList[i].numberValue != null){ - if((this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue != ""&& this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)){ + if((this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)){ this.detailList[i].itemResult = '不合格' } } diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index 3e4aba4..88bede1 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -394,6 +394,7 @@ endDate:'', page: 1, limit: 10, + searchType: 'reportDefect' }, height: 200, pageIndex: 1, diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue index 0da0084..f9ecef2 100644 --- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue +++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue @@ -472,6 +472,7 @@ endDate:'', page: 1, limit: 10, + searchType: 'reportMaintenance' }, height: 200, pageIndex: 1,