Forráskód Böngészése

修改随时可复运

HD_wangm 4 hónapja
szülő
commit
21aad0c351

+ 0 - 6
ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtWorkOrderServiceImpl.java

@@ -919,12 +919,6 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         }
         else if ("restarted".equals(targetStatus))
         {
-            // 复运:仅有已完成的工单才能复运
-            if (!"completed".equals(order.getWorkOrderStatus()))
-            {
-                throw new ServiceException("仅有已完成的工单才能复运");
-            }
-
             String oldStatus = order.getWorkOrderStatus();
             order.setRestartTime(gxtWorkOrder.getRestartTime());
             order.setLostPower(gxtWorkOrder.getLostPower());

+ 4 - 1
ygtx-ui/src/views/gxt/gxtOrder/index.vue

@@ -267,7 +267,10 @@
 <!--          </el-button>-->
 
           <!-- 已完成状态:显示复运按钮 -->
-          <el-button link type="success" @click="handleRestart(scope.row)" v-if="scope.row.workOrderStatus === 'completed' && scope.row.restartTime == null" v-hasPermi="['gxt:maintenance:order:restart']">
+<!--          <el-button link type="success" @click="handleRestart(scope.row)" v-if="scope.row.workOrderStatus === 'completed' && scope.row.restartTime == null" v-hasPermi="['gxt:maintenance:order:restart']">-->
+<!--            <i class="fa fa-refresh"></i>复运-->
+<!--          </el-button>-->
+          <el-button link type="success" @click="handleRestart(scope.row)" v-if="scope.row.restartTime == null" v-hasPermi="['gxt:maintenance:order:restart']">
             <i class="fa fa-refresh"></i>复运
           </el-button>
 

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

@@ -208,7 +208,7 @@
             ><i class="fa fa-check-circle"></i>审批</el-button>
 
             <el-button
-                v-if="scope.row.workOrderStatus === 'completed'"
+                v-if="scope.row.restartTime == null"
                 type="success"
                 link
                 @click="handleRestart(scope.row)"
@@ -261,7 +261,7 @@
             <el-button
                 link type="success"
                 @click="handleRestart(scope.row)"
-                v-if="scope.row.workOrderStatus === 'completed'"
+                v-if="scope.row.restartTime == null"
                 v-hasPermi="['gxt:maintenance:order:restart']">
               <i class="fa fa-refresh"></i>复运
             </el-button>

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

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