Merge branch 'zjw'

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<InspectionInfoDO> {
                 .eqIfPresent(InspectionInfoDO::getCustomerId, reqVO.getCustomerId())
                 .eqIfPresent(InspectionInfoDO::getInspectionPlanId, reqVO.getInspectionPlanId())
                 .eqIfPresent(InspectionInfoDO::getStatus, reqVO.getStatus())
+                .neIfPresent(InspectionInfoDO::getStatus,3)
                 .orderByDesc(InspectionInfoDO::getInspectionId));
     }
 

imt-ui/src/views/system/inspection/inspectionInfo/index.vue

@@ -38,7 +38,7 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INSPECTION_STATUS)"
+          <el-option v-for="dict in inspectionStatusList"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -50,10 +50,10 @@
 
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+<!--            <el-col :span="1.5">-->
-              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+<!--              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"-->
-                         v-hasPermi="['imt:inspection-info:create']">新增</el-button>
+<!--                         v-hasPermi="['imt:inspection-info:create']">新增</el-button>-->
-            </el-col>
+<!--            </el-col>-->
       <!--      <el-col :span="1.5">-->
       <!--        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"-->
       <!--                   v-hasPermi="['imt:inspection-info:export']">导出</el-button>-->
@@ -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){