维修模糊查询、复运按钮显示修改

ygtx-gxt/src/main/resources/mapper/gxt/GxtRepairOrderMapper.xml

@@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectGxtRepairOrderList" parameterType="GxtRepairOrder" resultMap="GxtRepairOrderResult">
         <include refid="selectGxtRepairOrderVo"/>
         <where>  
-            <if test="workOrderProjectNo != null  and workOrderProjectNo != ''"> and work_order_project_no = #{workOrderProjectNo}</if>
+            <if test="workOrderProjectNo != null  and workOrderProjectNo != ''"> and work_order_project_no like concat('%',  #{workOrderProjectNo}, '%')</if>
             <if test="workOrderStatus != null  and workOrderStatus != ''"> and work_order_status = #{workOrderStatus}</if>
             <if test="gxtCenterId != null "> and gxt_center_id = #{gxtCenterId}</if>
             <if test="gxtCenter != null  and gxtCenter != ''"> and gxt_center = #{gxtCenter}</if>

ygtx-ui/src/views/gxt/gxtOrder/index.vue

@@ -313,7 +313,8 @@
           </el-button>
 
           <el-button link type="danger" @click="handleShutdown(scope.row)"
-                     v-if="scope.row.pauseTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'"
+                     v-if="scope.row.pauseTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'
+                     && scope.row.workOrderStatus != 'invalid'"
                      v-hasPermi="['gxt:maintenance:order:shutdown']">
             <i class="fa fa-stop"></i>停机
           </el-button>
@@ -325,7 +326,8 @@
 
           <!-- 已完成状态：显示复运按钮 -->
           <el-button link type="success" @click="handleRestart(scope.row)"
-                     v-if="scope.row.restartTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'"
+                     v-if="scope.row.restartTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'
+                     && scope.row.workOrderStatus != 'invalid'"
                      v-hasPermi="['gxt:maintenance:order:restart']">
             <i class="fa fa-refresh"></i>复运
           </el-button>

ygtx-ui/src/views/gxt/orderMyTodo/index.vue

@@ -217,7 +217,8 @@
                 v-hasPermi="['gxt:repairOrder:approve']"
             ><i class="fa fa-check-circle"></i>审批</el-button>
             <el-button
-                v-if="scope.row.restartTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend' && scope.row.workOrderStatus != 'accept_return'"
+                v-if="scope.row.restartTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'
+                && scope.row.workOrderStatus != 'accept_return' && scope.row.workOrderStatus != 'invalid'"
                 type="success"
                 link
                 @click="handleRestart(scope.row)"
@@ -281,14 +282,16 @@
                 v-hasPermi="['gxt:maintenance:order:approve']"
             ><i class="fa fa-check-circle"></i>审批</el-button>
             <el-button link type="danger" @click="handleShutdown(scope.row)"
-                       v-if="scope.row.pauseTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'"
+                       v-if="scope.row.pauseTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'
+                       && scope.row.workOrderStatus != 'invalid'"
                        v-hasPermi="['gxt:maintenance:order:shutdown']">
               <i class="fa fa-stop"></i>停机
             </el-button>
             <el-button
                 link type="success"
                 @click="handleRestart(scope.row)"
-                v-if="scope.row.restartTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'"
+                v-if="scope.row.restartTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'
+                && scope.row.workOrderStatus != 'invalid'"
                 v-hasPermi="['gxt:maintenance:order:restart']">
               <i class="fa fa-refresh"></i>复运
             </el-button>

ygtx-ui/src/views/gxt/repairOrder/index.vue

@@ -385,7 +385,8 @@
 <!--              v-hasPermi="['gxt:repairOrder:rating']"-->
 <!--          ><i class="fa fa-star"></i>评分</el-button>-->
           <el-button
-              v-if="scope.row.restartTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend' && scope.row.workOrderStatus != 'accept_return'"
+              v-if="scope.row.restartTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'
+              && scope.row.workOrderStatus != 'accept_return' && scope.row.workOrderStatus != 'invalid'"
               type="success"
               link
               @click="handleRestart(scope.row)"