Merge remote-tracking branch 'origin/master'

ygtx-gxt/src/main/resources/mapper/gxt/source/GxtMisInfoMapper.xml

@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endRealEndTime != null and endRealEndTime != ''"> and date_format(real_end_time,'%y%m%d') &lt;= date_format(#{endRealEndTime},'%y%m%d')</if>
             <if test="pauseTime != null"> and real_start_time &gt;= #{pauseTime}</if>
             <if test="restartTime != null"> and real_start_time &lt; #{restartTime}</if>
+            <if test="workPermitNum != null"> and work_ticket_no like concat('%', #{workPermitNum}, '%')</if>
         </where>
         order by create_time desc
     </select>

ygtx-ui/src/components/gxtOrder/finalize.vue

@@ -138,7 +138,7 @@
         <slot name="mis-info-select"></slot>
         <el-col :span="12">
           <el-form-item label="工作票编号" prop="workPermitNum">
-            <el-input v-model="workPermitNumProxy" maxlength="20" show-word-limit :readonly="formData.infoEntry == '1'" />
+            <el-input v-model="workPermitNumProxy" placeholder="请输入工作票编号" maxlength="20" show-word-limit :readonly="formData.infoEntry == '1'" />
           </el-form-item>
         </el-col>
         <el-col :span="12">

ygtx-ui/src/components/misInfoSelect/single.vue

@@ -36,6 +36,15 @@
               disabled
             />
           </el-form-item>
+          <el-form-item label="工作票编号" prop="workPermitNum">
+            <el-input
+                v-model="queryParams.workPermitNum"
+                placeholder="请输入工作票编号"
+                clearable
+                style="width: 240px"
+                @keyup.enter="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="结束时间" prop="realEndTime">
             <el-date-picker
               v-model="realEndTimeRange"
@@ -63,7 +72,7 @@
           <el-table-column label="风机编号" align="center" key="pcsDeviceName" prop="pcsDeviceName" :show-overflow-tooltip="true" />
           <el-table-column label="场站" align="center" key="pcsStationName" prop="pcsStationName" :show-overflow-tooltip="true" />
           <el-table-column label="检修内容" align="center" key="content" prop="content" :show-overflow-tooltip="true" />
-          <el-table-column label="工作票号" align="center" key="workPermitNum" prop="workPermitNum" :show-overflow-tooltip="true" min-width="120" />
+          <el-table-column label="工作票编号" align="center" key="workPermitNum" prop="workPermitNum" :show-overflow-tooltip="true" min-width="120" />
           <el-table-column label="状态" align="center" key="workOrderStatus" prop="workOrderStatus" :show-overflow-tooltip="true" />
 <!--          <el-table-column label="计划开始时间" align="center" key="planStartTime" prop="planStartTime" :show-overflow-tooltip="true" />-->
 <!--          <el-table-column label="计划结束时间" align="center" key="planEndTime" prop="planEndTime" :show-overflow-tooltip="true" />-->
@@ -170,6 +179,7 @@ const queryParams = reactive({
   endRealEndTime: undefined,    // 添加结束时间参数
   pauseTime: undefined, // 使用 props 的初始值
   restartTime: undefined, // 使用 props 的初始值
+  workPermitNum: undefined
 })
 
 // 组件挂载时查询数据

ygtx-ui/src/components/repairOrder/finalize.vue

@@ -112,7 +112,7 @@
         <slot name="mis-info-select"></slot>
         <el-col :span="12">
           <el-form-item label="工作票编号" prop="workPermitNum">
-            <el-input v-model="workPermitNumProxy" maxlength="20" show-word-limit :readonly="formData.infoEntry == '1'" />
+            <el-input v-model="workPermitNumProxy" placeholder="请输入工作票编号" maxlength="20" show-word-limit :readonly="formData.infoEntry == '1'" />
           </el-form-item>
         </el-col>
         <el-col :span="12">