PSSR增加数据删除标志校验

master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml

@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_airtight where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_airtight where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <insert id="insertTPssrAirtight" parameterType="TPssrAirtight">

master/src/main/resources/mybatis/pssr/TPssrAnalyzerMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Analyzer where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Analyzer where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrAnalyzerList" parameterType="TPssrAnalyzer" resultMap="TPssrAnalyzerResult">

master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_blind where sub_id = #{subId} and IN_CONFIRM1 is null and IN_CONFIRM2 is null
+        select count(1) from t_pssr_blind where sub_id = #{subId} and IN_CONFIRM1 is null and IN_CONFIRM2 is null  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrBlindList" parameterType="TPssrBlind" resultMap="TPssrBlindResult">

master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Circuit where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Circuit where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrCircuitList" parameterType="TPssrCircuit" resultMap="TPssrCircuitResult">

master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Cleaning where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Cleaning where sub_id = #{subId} and (confirm1 is null or confirm2 is null) and d.del_flag = 0
     </select>
 
     <select id="selectTPssrCleaningList" parameterType="TPssrCleaning" resultMap="TPssrCleaningResult">

master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml

@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_frame where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_frame where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrFrameList" parameterType="TPssrFrame" resultMap="TPssrFrameResult">
@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirm1 != null "> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null "> and confirm2 = #{confirm2}</if>
             <if test="examiner != null "> and examiner = #{examiner}</if>
-            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')) or bracket_number like concat('%',concat(#{searchValue},'%')) or pipeline_number like concat('%',concat(#{searchValue},'%')) or )</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')) or bracket_number like concat('%',concat(#{searchValue},'%')) or pipeline_number like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/pssr/TPssrFranklinismMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Franklinism where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Franklinism where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrFranklinismList" parameterType="TPssrFranklinism" resultMap="TPssrFranklinismResult">

master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Gasdetector where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Gasdetector where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrGasdetectorList" parameterType="TPssrGasdetector" resultMap="TPssrGasdetectorResult">

master/src/main/resources/mybatis/pssr/TPssrHygieneMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Hygiene where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Hygiene where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrHygieneList" parameterType="TPssrHygiene" resultMap="TPssrHygieneResult">

master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from T_PSSR_INSTRUMENT_CALIBRATION where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from T_PSSR_INSTRUMENT_CALIBRATION where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrInstrumentCalibrationList" parameterType="TPssrInstrumentCalibration" resultMap="TPssrInstrumentCalibrationResult">

master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Laboratory where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Laboratory where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrLaboratoryList" parameterType="TPssrLaboratory" resultMap="TPssrLaboratoryResult">

master/src/main/resources/mybatis/pssr/TPssrLightingMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Lighting where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Lighting where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrLightingList" parameterType="TPssrLighting" resultMap="TPssrLightingResult">

master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_lock where sub_id = #{subId} and lockeder is null and confirm is null
+        select count(1) from t_pssr_lock where sub_id = #{subId} and lockeder is null and confirm is null  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrLockList" parameterType="TPssrLock" resultMap="TPssrLockResult">

master/src/main/resources/mybatis/pssr/TPssrMaterialMapper.xml

@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Material where sub_id = #{subId} and (confirm1 is null)
+        select count(1) from t_pssr_Material where sub_id = #{subId} and (confirm1 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrMaterialList" parameterType="TPssrMaterial" resultMap="TPssrMaterialResult">

master/src/main/resources/mybatis/pssr/TPssrMaterialRawMapper.xml

@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Material_Raw where sub_id = #{subId} and (confirm1 is null)
+        select count(1) from t_pssr_Material_Raw where sub_id = #{subId} and (confirm1 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrMaterialRawList" parameterType="TPssrMaterialRaw" resultMap="TPssrMaterialRawResult">

master/src/main/resources/mybatis/pssr/TPssrMeasureMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Measure where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Measure where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrMeasureList" parameterType="TPssrMeasure" resultMap="TPssrMeasureResult">

master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Moc where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Moc where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrMocList" parameterType="TPssrMoc" resultMap="TPssrMocResult">

master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Motor where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Motor where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrMotorList" parameterType="TPssrMotor" resultMap="TPssrMotorResult">

master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Nitrogen where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Nitrogen where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrNitrogenList" parameterType="TPssrNitrogen" resultMap="TPssrNitrogenResult">

master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        SELECT
+        SELECT  and d.del_flag = 0
             (SELECT COUNT(1) FROM T_PSSR_OVERHAUL_EXCHANGER WHERE sub_id = #{subId} and CONFIRMED_PERSON IS NULL) +
             (SELECT COUNT(1) FROM T_PSSR_OVERHAUL_FILTER WHERE sub_id = #{subId} and RESP_PERSON IS NULL) +
             (SELECT COUNT(1) FROM T_PSSR_OVERHAUL_TOWER WHERE sub_id = #{subId} and CONFIRMED_PERSON IS NULL) +

master/src/main/resources/mybatis/pssr/TPssrPatrolMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from T_PSSR_PATROL where sub_id = #{subId} and APPROVE_STATUS!=2
+        select count(1) from T_PSSR_PATROL where sub_id = #{subId} and APPROVE_STATUS!=2  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrPatrolList" parameterType="TPssrPatrol" resultMap="TPssrPatrolResult">

master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml

@@ -37,7 +37,7 @@
     </sql>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from T_PSSR_PIPE where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)
+        select count(1) from T_PSSR_PIPE where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrPipeList" parameterType="TPssrPipe" resultMap="TPssrPipeResult">

master/src/main/resources/mybatis/pssr/TPssrPowerMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Power where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Power where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrPowerList" parameterType="TPssrPower" resultMap="TPssrPowerResult">

master/src/main/resources/mybatis/pssr/TPssrProgrammeMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Programme where sub_id = #{subId} and confirm1 is null and confirm2 is null
+        select count(1) from t_pssr_Programme where sub_id = #{subId} and confirm1 is null and confirm2 is null  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrProgrammeList" parameterType="TPssrProgramme" resultMap="TPssrProgrammeResult">

master/src/main/resources/mybatis/pssr/TPssrProtectionMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Protection where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Protection where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrProtectionList" parameterType="TPssrProtection" resultMap="TPssrProtectionResult">

master/src/main/resources/mybatis/pssr/TPssrPublicMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Public where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Public where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrPublicList" parameterType="TPssrPublic" resultMap="TPssrPublicResult">

master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select
+        select  and d.del_flag = 0
             (select count(1) from T_PSSR_PUMP_CLEANING where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null))+
             (select count(1) from T_PSSR_PUMP_FILL where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null))+
             (select count(1) from T_PSSR_PUMP_OVERHAUL where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null))

master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml

@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select
+        select  and d.del_flag = 0
             (select count(1) from T_PSSR_SAFETY_BLEED where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null))+
             (select count(1) from T_PSSR_SAFETY_BREATH where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null))+
             (select count(1) from T_PSSR_SAFETY_BRUST where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null))+

master/src/main/resources/mybatis/pssr/TPssrTorchvocMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_Torchvoc where sub_id = #{subId} and (confirm1 is null or confirm2 is null)
+        select count(1) from t_pssr_Torchvoc where sub_id = #{subId} and (confirm1 is null or confirm2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrTorchvocList" parameterType="TPssrTorchvoc" resultMap="TPssrTorchvocResult">

master/src/main/resources/mybatis/pssr/TPssrVesselMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
-        select count(1) from t_pssr_vessel where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)
+        select count(1) from t_pssr_vessel where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and d.del_flag = 0
     </select>
 
     <select id="selectTPssrVesselList" parameterType="TPssrVessel" resultMap="TPssrVesselResult">

ui/src/views/pssr/cleaning/index.vue

@@ -22,14 +22,8 @@
           <el-option label="冷箱" value="冷箱"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="检查内容" prop="checkContent">
-        <el-input
-          v-model="queryParams.checkContent"
-          placeholder="请输入检查内容"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="位号" prop="devNo">
+        <el-input v-model="queryParams.devNo" @keyup.enter.native="handleQuery" placeholder="请输入位号"/>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

ui/src/views/pssr/overhaulExchanger/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="位号/管线号" prop="tagNo">
         <el-input
           v-model="queryParams.tagNo"
@@ -19,15 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="检修内容" prop="workDes">
-        <el-input
-          v-model="queryParams.workDes"
-          placeholder="请输入检修内容"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="图号" prop="pidNo">
         <el-input
           v-model="queryParams.pidNo"
@@ -37,14 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="完成时间" prop="completionDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.completionDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择完成时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

ui/src/views/pssr/overhaulTower/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="位号/管线号" prop="tagNo">
         <el-input
           v-model="queryParams.tagNo"
@@ -19,15 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="检修内容" prop="workDes">
-        <el-input
-          v-model="queryParams.workDes"
-          placeholder="请输入检修内容"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="图号" prop="pidNo">
         <el-input
           v-model="queryParams.pidNo"
@@ -37,14 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="完成时间" prop="completionDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.completionDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择完成时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

ui/src/views/pssr/overhaulValve/index.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目" prop="item">
-        <el-input
-          v-model="queryParams.item"
-          placeholder="请输入项目"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="图号" prop="pidNo">
         <el-input
           v-model="queryParams.pidNo"

ui/src/views/pssr/public/index.vue

@@ -1,24 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <!--<el-form-item label="从表id" prop="subId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.subId"-->
-          <!--placeholder="请输入从表id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="审批id" prop="approveId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.approveId"-->
-          <!--placeholder="请输入审批id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
       <el-form-item label="检查内容" prop="checkContent">
         <el-input
           v-model="queryParams.checkContent"
@@ -28,94 +10,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="检查结果" prop="checkResult">
-        <el-input
-          v-model="queryParams.checkResult"
-          placeholder="请输入检查结果"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!--<el-form-item label="确认人" prop="confirm">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.confirm"-->
-          <!--placeholder="请输入确认人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <el-form-item label="确认人1" prop="confirm1">
-        <el-input
-          v-model="queryParams.confirm1"
-          placeholder="请输入确认人1"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="确认人2" prop="confirm2">
-        <el-input
-          v-model="queryParams.confirm2"
-          placeholder="请输入确认人2"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!--<el-form-item label="创建人" prop="createrCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.createrCode"-->
-          <!--placeholder="请输入创建人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="创建时间" prop="createdate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.createdate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择创建时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="修改人" prop="updaterCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.updaterCode"-->
-          <!--placeholder="请输入修改人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="修改时间" prop="updatedate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.updatedate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择修改时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="部门编号" prop="deptId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.deptId"-->
-          <!--placeholder="请输入部门编号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

ui/src/views/pssr/safetyFlamearrester/index.vue

@@ -10,10 +10,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="紧急泄放阀位号" prop="devNo">
+      <el-form-item label="位号" prop="devNo">
         <el-input
           v-model="queryParams.devNo"
-          placeholder="请输入紧急泄放阀位号"
+          placeholder="请输入位号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"

ui/src/views/pssr/subcontent/index.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="序号" prop="serialNumber">
-        <el-input
-          v-model="queryParams.serialNumber"
-          placeholder="请输入序号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="项目" prop="item">
         <el-input
           v-model="queryParams.item"
@@ -19,15 +10,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="确认人" prop="confirm">
-        <el-input
-          v-model="queryParams.confirm"
-          placeholder="请输入确认人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>