From c79adbcdae1bf70cb12e27b6db0c0efc798c56e3 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Wed, 19 Oct 2022 20:06:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/service/dto/TaskDto.java | 2 +- .../wms/sch/service/impl/TaskServiceImpl.java | 7 +- .../java/org/nl/wms/sch/wql/QSCH_TASK_01.wql | 4 +- .../src/views/wms/sch/task/index.vue | 120 ++++++++++++++---- 4 files changed, 102 insertions(+), 31 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskDto.java index 50b0e79..355e8a0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskDto.java @@ -24,7 +24,7 @@ public class TaskDto implements Serializable { private String task_code; /** 任务类型 */ - private Long task_type; + private String task_type; /** 任务状态 */ private String task_status; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index 2f2ca62..77c15ee 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -14,6 +14,8 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; +import org.nl.wms.basedata.service.ClassstandardService; +import org.nl.wms.basedata.service.dto.ClassstandardDto; import org.nl.wms.sch.service.TaskService; import org.nl.wms.sch.service.dto.TaskDto; import org.springframework.data.domain.Pageable; @@ -35,6 +37,8 @@ import java.util.Map; @Slf4j public class TaskServiceImpl implements TaskService { + private final ClassstandardService classstandardService; + @Override public Map queryAll(Map form, Pageable page) { @@ -66,7 +70,8 @@ public class TaskServiceImpl implements TaskService { map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%"); } if (StrUtil.isNotEmpty(whereJson.getString("task_type"))) { - map.put("task_type", whereJson.getString("task_type")); + ClassstandardDto task_type = classstandardService.findById(whereJson.getString("task_type")); + map.put("task_type", task_type.getClass_code()); } if (StrUtil.isNotEmpty(whereJson.getString("taskdtl_type"))) { map.put("taskdtl_type", whereJson.getString("taskdtl_type")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql index 565a297..233bcd7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql @@ -52,10 +52,12 @@ PAGEQUERY SELECT task.*, - md.class_name task_type_name + md.class_name task_type_name, + dict.label task_status_name FROM sch_base_task task LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code + LEFT JOIN sys_dict_detail dict ON dict.`value` = task.task_status AND dict.`name` = 'task_status' WHERE task.is_delete = '0' OPTION 输入.task_type <> "" diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue index 1ed03eb..d4425e3 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -40,21 +40,13 @@ /> - - - + placeholder="请选择" + /> @@ -187,13 +175,17 @@ import crudTask from '@/api/wms/sch/task' import CRUD, { crud, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' +import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' +import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' +import '@riophae/vue-treeselect/dist/vue-treeselect.css' +import crudClassstandard from '@/api/wms/basedata/classstandard' export default { name: 'Task', dicts: [], components: { - pagination, crudOperation, rrOperation + pagination, crudOperation, rrOperation, Treeselect, udOperation }, mixins: [presenter(), header(), crud()], cruds() { @@ -229,10 +221,12 @@ export default { permission: { }, - rules: {} + rules: {}, + classes1: [] } }, created() { + this.initClass1() crudTask.getTaskStatus().then(data => { this.taskStatusList = data }) @@ -243,6 +237,42 @@ export default { this.crud.toQuery() }, methods: { + initClass1() { + const param = { + parent_class_code: 'task_type' + } + crudClassstandard.getClassType(param).then(res => { + const data = res.content + this.buildTree(data) + this.classes1 = data + }) + }, + buildTree(classes) { + classes.forEach(data => { + if (data.children) { + this.buildTree(data.children) + } + if (data.hasChildren && !data.children) { + data.children = null // 重点代码 + } + }) + }, + // 获取子节点数据 + loadChildNodes({ action, parentNode, callback }) { + if (action === LOAD_CHILDREN_OPTIONS) { + crudClassstandard.getClass({ pid: parentNode.id }).then(res => { + parentNode.children = res.content.map(function(obj) { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + setTimeout(() => { + callback() + }, 100) + }) + } + }, hand(value) { this.crud.toQuery() }, @@ -268,6 +298,40 @@ export default { } return '' }, + doOperate(row, command) { + let method_name = '' + switch (command) { + case 'a':// 完成 + method_name = 'forceFinish' + break + case 'b':// 取消 + method_name = 'cancel' + break + case 'c':// 拉回 + method_name = 'pullBack' + break + case 'd':// 下发 + method_name = 'renotifyAcs' + break + case 'e':// 详情 + method_name = 'view' + break + } + if (method_name === 'view') { + this.view(row) + return + } + const data = { + task_id: row.task_id, + method_name: method_name + } + crudTask.operation(data).then(res => { + this.crud.toQuery() + this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + }).catch(err => { + console.log(err.response.data.message) + }) + }, beforeHandleCommand(index, row, command) { return { 'index': index,