diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/inspection/InspectionInfoMapper.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/inspection/InspectionInfoMapper.java index 34709a7..15374fc 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/inspection/InspectionInfoMapper.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/inspection/InspectionInfoMapper.java @@ -22,6 +22,7 @@ public interface InspectionInfoMapper extends BaseMapperX { .eqIfPresent(InspectionInfoDO::getCustomerId, reqVO.getCustomerId()) .eqIfPresent(InspectionInfoDO::getInspectionPlanId, reqVO.getInspectionPlanId()) .eqIfPresent(InspectionInfoDO::getStatus, reqVO.getStatus()) + .neIfPresent(InspectionInfoDO::getStatus,3) .orderByDesc(InspectionInfoDO::getInspectionId)); } diff --git a/imt-ui/src/views/system/inspection/inspectionInfo/index.vue b/imt-ui/src/views/system/inspection/inspectionInfo/index.vue index d025653..d9eeebc 100644 --- a/imt-ui/src/views/system/inspection/inspectionInfo/index.vue +++ b/imt-ui/src/views/system/inspection/inspectionInfo/index.vue @@ -38,7 +38,7 @@ - @@ -50,10 +50,10 @@ - - 新增 - + + + + @@ -158,6 +158,7 @@ import * as InspectionInfoApi from '@/api/system/inspection/inspectionInfo'; import InspectionInfoForm from './InspectionInfoForm.vue'; import {getEquipCascader} from "@/api/system/equip/equipInfo"; import {getCustomerSelection} from "@/api/system/baseData/customerInfo"; +import {DICT_TYPE, getDictDatas} from "@/utils/dict"; export default { name: "InspectionInfo", @@ -166,6 +167,7 @@ export default { }, data() { return { + inspectionStatusList:[], exclusiveInspectionFeedbackTitle:"定制化点检反馈", exclusiveInspectionFeedbackVisible:false, exclusiveInspectionFeedbackData:{}, @@ -273,6 +275,7 @@ export default { }) this.equipCascader = res; }) + this.inspectionStatusList = getDictDatas(DICT_TYPE.INSPECTION_STATUS).filter(item => item.value !== "3"); }, cascaderChange(value){ if (value.length > 0){