feat: 页面优化

pengyongcheng
1 parent dcb92a74
Showing 2 changed files with 20 additions and 28 deletions
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -93,7 +93,8 @@ public class TaskHeaderController extends BaseController {
                 .like(StringUtils.isNotEmpty(taskHeader.getVehicleCode()), TaskHeader::getVehicleCode, taskHeader.getVehicleCode())
                 .like(StringUtils.isNotEmpty(taskHeader.getToLocation()), TaskHeader::getToLocation, taskHeader.getToLocation())
                 .like(StringUtils.isNotEmpty(taskHeader.getZoneCode()), TaskHeader::getZoneCode, taskHeader.getZoneCode())
-                .eq(StringUtils.isNotNull(taskHeader.getPriority()), TaskHeader::getPriority, taskHeader.getPriority())
+                .like(StringUtils.isNotEmpty(taskHeader.getFromPort()), TaskHeader::getFromPort, taskHeader.getFromPort())
+                .like(StringUtils.isNotEmpty(taskHeader.getPort()), TaskHeader::getPort, taskHeader.getPort())
                 .ge(StringUtils.isNotEmpty(createdBegin), TaskHeader::getCreated, createdBegin)
                 .ge(StringUtils.isNotNull(taskHeader.getCallBackTimes()), TaskHeader::getCallBackTimes, taskHeader.getCallBackTimes())
                 .lt(StringUtils.isNotEmpty(createdEnd), TaskHeader::getCreated, createdEnd)
@@ -50,8 +50,16 @@
                                         <input name="fromLocation" placeholder="请输入原库位编码" type="text"/>
                                     </li>
                                     <li>
-                                        <label>目的库位编码：</label>
-                                        <input name="toLocation" placeholder="请输入目的库位编码" type="text"/>
+                                        <label>目标库位编码：</label>
+                                        <input name="toLocation" placeholder="请输入目标库位编码" type="text"/>
+                                    </li>
+                                    <li>
+                                        <label>来源料点：</label>
+                                        <input name="fromPort" placeholder="请输入来源料点" type="text"/>
+                                    </li>
+                                    <li>
+                                        <label>目标料点：</label>
+                                        <input name="port" placeholder="请输入目标料点" type="text"/>
                                     </li>
                                     <li>
                                         <label>回传次数：</label>
@@ -161,10 +169,10 @@
                                 actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
                             }
                         }
-                        if (row.status >= 10 && row.status < 100) {
-                            // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
-                            // actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
-                        }
+                        /*if (row.status >= 10 && row.status < 100) {
+                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
+                            actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+                        }*/
                         return actions.join('');
                     }
                 },
@@ -187,11 +195,6 @@
                         return actions.join('');
                     }
                 },
-                /*{
-                    field: 'companyCode',
-                    title: '货主编码',
-                    visible: false
-                },*/
                 {
                     field: 'taskType',
                     title: '任务类型',
@@ -229,13 +232,13 @@
                 },
                 {
                     field: 'fromPort',
-                    title: '来源口',
+                    title: '来源料点',
                     align: 'center',
                     visible: true,
                 },
                 {
                     field: 'port',
-                    title: '出库口',
+                    title: '目标料点',
                     align: 'center',
                     visible: true,
                 },
@@ -308,7 +311,6 @@
                 {
                     field: 'lastUpdatedBy',
                     title: '更新用户',
-                    visible: false
                 },
             ]
         };
@@ -334,14 +336,6 @@
             {
                 checkbox: true
             },
-            /*{
-                field: 'id',
-                title: '明细ID'
-            },
-            {
-                field: 'taskId',
-                title: '任务头ID',
-            },*/
             {
                 field: 'billCode',
                 title: '单据编码',
@@ -439,13 +433,11 @@
             },
             {
                 field: 'created',
-                title: '创建时间',
-                visible: true,
+                title: '创建时间'
             },
             {
                 field: 'lastUpdated',
-                title: '最后修改时间',
-                visible: true,
+                title: '最后修改时间'
             },
             {
                 field: 'lastUpdatedBy',
@@ -455,7 +447,6 @@
     });
  
     function createtable(url, taskId) {
-        // $("#tabDetail").children().remove();
         $("#myTab li").removeClass("active");
         $(".tab-pane").removeClass("in active");
         $("#myTab li:eq(1)").addClass("active");