fix: 任务配置修复

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java

@@ -3,6 +3,7 @@ package org.nl.wms.sch.task.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -42,7 +43,17 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
 
     @Override
     public IPage<SchBaseTask> queryAll(Map whereJson, PageQuery page) {
+        String task_code = ObjectUtil.isNotEmpty(whereJson.get("task_code")) ? whereJson.get("task_code").toString() : null;
+        String vehicle_code = ObjectUtil.isNotEmpty(whereJson.get("vehicle_code")) ? whereJson.get("vehicle_code").toString() : null;
+        String point_code = ObjectUtil.isNotEmpty(whereJson.get("point_code")) ? whereJson.get("point_code").toString() : null;
+        String begin_time = ObjectUtil.isNotEmpty(whereJson.get("begin_time")) ? whereJson.get("begin_time").toString() : null;
+        String end_time = ObjectUtil.isNotEmpty(whereJson.get("end_time")) ? whereJson.get("end_time").toString() : null;
         LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
+        lam.eq(ObjectUtil.isNotEmpty(task_code), SchBaseTask::getTask_code, task_code)
+                .eq(ObjectUtil.isNotEmpty(vehicle_code), SchBaseTask::getVehicle_code, vehicle_code)
+                .eq(ObjectUtil.isNotEmpty(point_code), SchBaseTask::getPoint_code1, point_code)
+                .ge(ObjectUtil.isNotEmpty(begin_time), SchBaseTask::getCreate_time, begin_time)
+                .le(ObjectUtil.isNotEmpty(end_time), SchBaseTask::getCreate_time, end_time);
         IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
         schBaseTaskMapper.selectPage(pages, lam);
         return pages;

nladmin-ui/src/views/wms/sch/task/config/index.vue

@@ -424,6 +424,9 @@ export default {
   computed: {
     getRegionNames() {
       return (nextRegionStr) => {
+        if (!nextRegionStr) {
+          return '-'
+        }
         const regionCodes = nextRegionStr.split(',').map(code => code.trim())
         const regionNames = regionCodes
           .map(code => {

nladmin-ui/src/views/wms/sch/task/index.vue

@@ -2,6 +2,102 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="任务号">
+            <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
+            <el-input
+              v-model="query.task_code"
+              clearable
+              style="width: 180px"
+              placeholder="任务号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="载具号">
+            <label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
+            <el-input
+              v-model="query.vehicle_code"
+              clearable
+              style="width: 180px"
+              placeholder="载具号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="点位编码">
+            <el-input
+              v-model="query.point_code"
+              clearable
+              style="width: 180px"
+              placeholder="起点"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+<!--          <el-form-item label="任务类型">-->
+<!--            <treeselect-->
+<!--              v-model="query.task_type"-->
+<!--              :load-options="loadChildNodes"-->
+<!--              :options="classes1"-->
+<!--              style="width: 180px"-->
+<!--              placeholder="请选择"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="完成方式">-->
+<!--            <el-select-->
+<!--              v-model="query.finished_type"-->
+<!--              style="width: 180px"-->
+<!--              placeholder="完成方式"-->
+<!--              class="filter-item"-->
+<!--              clearable-->
+<!--              @change="hand"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in finishTypeList"-->
+<!--                :key="item.code"-->
+<!--                clearable-->
+<!--                :label="item.name"-->
+<!--                :value="item.code"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+<!--          <el-form-item label="任务状态">-->
+<!--            <el-select-->
+<!--              v-model="query.task_status"-->
+<!--              multiple-->
+<!--              style="width: 400px"-->
+<!--              placeholder="任务状态"-->
+<!--              class="filter-item"-->
+<!--              clearable-->
+<!--              @change="handTaskStatus"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in taskStatusList"-->
+<!--                :key="item.code"-->
+<!--                :label="item.name"-->
+<!--                :value="item.code"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+          <rrOperation />
+        </el-form>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
@@ -169,7 +265,7 @@ const defaultForm = {
   workshop_code: null,
   ext_group_data: null,
   remark: null,
-  is_delete: null,
+  is_delete: false,
   create_id: null,
   create_name: null,
   create_time: null,
@@ -187,6 +283,13 @@ export default {
       url: 'api/schBaseTask',
       idField: 'task_code',
       sort: 'task_code,desc',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      },
       crudMethod: { ...crudSchBaseTask }
     })
   },
@@ -195,12 +298,16 @@ export default {
       permission: {
       },
       rules: {
-      }    }
+      }
+    }
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    hand(value) {
+      this.crud.toQuery()
     }
   }
 }