添加工单列表结单方式等

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/mobile/GxtMobileOrderController.java

@@ -503,4 +503,12 @@ public class GxtMobileOrderController extends BaseController
         }
         return toAjax(result);
     }
+
+    @GetMapping("/allListOrder")
+    public TableDataInfo allListOrder(GxtRepairOrder repairOrder, GxtWorkOrder workOrder, @Param("keyword") String keyword)
+    {
+        // 查询合并的工单列表
+        List<OrderScoreInfo> list = gxtOrderScoreService.selectMobileUnionOrderList(repairOrder, workOrder,keyword);
+        return getDataTable(list);
+    }
 }

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

@@ -294,7 +294,7 @@
         FROM gxt_repair_order t
         <where>
             <if test="keyword != null and keyword != ''">
-                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%') or mis_order_no = #{keyword} or work_permit_num = #{keyword})
+                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%') or mis_order_no = #{keyword})
             </if>
             <if test="repairOrder.workOrderProjectNo != null and repairOrder.workOrderProjectNo != ''"> and work_order_project_no = #{repairOrder.workOrderProjectNo}</if>
             <if test="repairOrder.workOrderStatus != null and repairOrder.workOrderStatus != ''"> and work_order_status in
@@ -311,6 +311,7 @@
             <if test="repairOrder.teamLeaderName != null and repairOrder.teamLeaderName != ''"> and team_leader_name like concat('%', #{repairOrder.teamLeaderName}, '%')</if>
             <if test="repairOrder.scoringStatus != null"> and scoring_status = #{repairOrder.scoringStatus}</if>
             <if test="repairOrder.orderType != null and repairOrder.orderType != ''"> and 1 = #{repairOrder.orderType}</if>
+            <if test="repairOrder.workPermitNum != null and repairOrder.workPermitNum != ''"> and work_permit_num = #{repairOrder.workPermitNum}</if>
             <!-- 超时工单条件：accept_time为空，并且当前时间超过assign_time并且超过时间大于配置值 -->
             <if test="repairOrder.params.overdueCondition != null and repairOrder.params.overdueCondition == 'overdue'">
                 and work_order_status = 'assigned'
@@ -391,7 +392,7 @@
         FROM gxt_work_order t
         <where>
             <if test="keyword != null and keyword != ''">
-                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%') or mis_no = #{keyword} or work_permit_num = #{keyword})
+                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%') or mis_no = #{keyword})
             </if>
             <if test="workOrder.workOrderProjectNo != null and workOrder.workOrderProjectNo != ''"> and work_order_project_no = #{workOrder.workOrderProjectNo}</if>
             <if test="workOrder.workOrderStatus != null and workOrder.workOrderStatus != ''"> and work_order_status in
@@ -408,6 +409,7 @@
             <if test="workOrder.teamLeaderName != null and workOrder.teamLeaderName != ''"> and team_leader_name like concat('%', #{workOrder.teamLeaderName}, '%')</if>
             <if test="workOrder.scoringStatus != null"> and scoring_status = #{workOrder.scoringStatus}</if>
             <if test="workOrder.orderType != null and workOrder.orderType != ''"> and 2 = #{workOrder.orderType}</if>
+            <if test="workOrder.workPermitNum != null and workOrder.workPermitNum != ''"> and work_permit_num = #{workOrder.workPermitNum}</if>
             <!-- 超时工单条件：accept_time为空，并且当前时间超过assign_time并且超过时间大于配置值 -->
             <if test="workOrder.params.overdueCondition != null and workOrder.params.overdueCondition == 'overdue'">
                 and work_order_status = 'assigned'

ygtx-ui/src/assets/styles/index.scss

@@ -226,7 +226,7 @@ aside {
 // }
 .el-form--inline.el-form--label-top{
   display: grid;
-  grid-template-columns: repeat(6, 1fr); /* 创建4列，每列平分空间 */
+  grid-template-columns: repeat(7, 1fr); /* 创建4列，每列平分空间 */
   gap: 3px; /* 设置列与列之间的间隔 */
 }
 

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

@@ -134,8 +134,6 @@
             </div>
           </el-form-item>
         </el-col>
-        <!-- MIS选择组件 -->
-        <slot name="mis-info-select"></slot>
         <el-col :span="12">
           <el-form-item label="工作票编号" prop="workPermitNum">
             <el-input v-model="workPermitNumProxy" placeholder="请输入工作票编号" maxlength="20" show-word-limit :readonly="formData.infoEntry == '1'" />
@@ -965,8 +963,8 @@ const handleInfoEntryChange = (val) => {
     formData.value.realEndTime = undefined;
     formData.value.workGroupMemberName = undefined;
     formData.value.workPermitNum = undefined
-    formData.value.teamLeaderName = undefined
-    formData.value.teamLeaderId = undefined
+    // formData.value.teamLeaderName = undefined
+    // formData.value.teamLeaderId = undefined
     formData.value.repairOrderPersonList = [];
     selectedUsers.value = [];
   } else {

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

@@ -715,8 +715,8 @@ const handleInfoEntryChange = (val) => {
     formData.value.realStartTime = undefined;
     formData.value.realEndTime = undefined;
     formData.value.workGroupMemberName = undefined;
-    formData.value.teamLeaderName = undefined
-    formData.value.teamLeaderId = undefined
+    // formData.value.teamLeaderName = undefined
+    // formData.value.teamLeaderId = undefined
     formData.value.repairOrderPersonList = [];
     selectedUsers.value = [];
   } else {

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

@@ -76,15 +76,18 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label-position="top">
-          <div class="item-search">&nbsp;</div>
-          <div class="item-search">
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          </div>
-      </el-form-item>
+<!--      <el-form-item label-position="top">-->
+<!--          <div class="item-search">&nbsp;</div>-->
+<!--          <div class="item-search">-->
+<!--              <el-button icon="Refresh" @click="resetQuery">重置</el-button>-->
+<!--              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>-->
+<!--          </div>-->
+<!--      </el-form-item>-->
     </el-form>
-
+    <div style="float: right;">
+      <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+    </div>
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
         <el-button

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

@@ -76,6 +76,16 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="处理方式" prop="repairMethod" label-position="top">
+        <el-select v-model="queryParams.repairMethod" placeholder="请选择处理方式" clearable>
+          <el-option
+              v-for="dict in gxt_repair_method"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
     <div style="float: right;">
       <el-button icon="Refresh" @click="resetQuery">重置</el-button>