From 38ebf1ded7ccedb0e323b99acd18b9e290290c35 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 29 Apr 2024 13:27:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/api/inventoryLogs/index.js | 8 +- sgzb-ui/src/views/inventoryLogs/index.vue | 350 +++++++++------------- 2 files changed, 150 insertions(+), 208 deletions(-) diff --git a/sgzb-ui/src/api/inventoryLogs/index.js b/sgzb-ui/src/api/inventoryLogs/index.js index 7cec71df..3ef43033 100644 --- a/sgzb-ui/src/api/inventoryLogs/index.js +++ b/sgzb-ui/src/api/inventoryLogs/index.js @@ -3,10 +3,14 @@ import request from '@/utils/request' /* 日志列表 */ export const getLogsListApi = (data) => { - return request.get('/bm_num_logs/list', data) + return request.get('/system/bm_num_logs/list', data) } /* 日志详情 */ export const getLogsDetailsApi = (id) => { - return request.get(`/bm_num_logs/selectByPrimaryKey/${id}`) + return request.get(`/system/bm_num_logs/selectByPrimaryKey`, { + params: { + id + } + }) } \ No newline at end of file diff --git a/sgzb-ui/src/views/inventoryLogs/index.vue b/sgzb-ui/src/views/inventoryLogs/index.vue index 3cef2250..23da27ed 100644 --- a/sgzb-ui/src/views/inventoryLogs/index.vue +++ b/sgzb-ui/src/views/inventoryLogs/index.vue @@ -1,218 +1,156 @@ From 7cef74aa2496be2e5cc722374d65f561d04b8b8d Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 29 Apr 2024 16:50:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=89=A9=E8=B5=84LOG=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/system/api/domain/BmNumLogs.java | 15 +++++++++ .../controller/BmNumLogsController.java | 4 +-- .../sgzb/system/mapper/BmNumLogsMapper.java | 2 +- .../system/service/impl/BmNumLogsService.java | 4 +-- .../mapper/system/BmNumLogsMapper.xml | 31 ++++++++++++++----- 5 files changed, 44 insertions(+), 12 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java index 840ffbf4..0a4ef93a 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java @@ -44,12 +44,27 @@ public class BmNumLogs extends BaseEntity { @Excel(name = "实例/任务") private String task; + /** + * 任务名称 + */ + private String taskName; + /** * 规格id */ @Excel(name = "规格id") private Integer typeId; + /** + * 规格名称 + */ + private String typeName; + + /** + * 父级规格名称 + */ + private String typeParentName; + /** * 数量 */ diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java index 15e4947d..a2a19dbf 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java @@ -27,9 +27,9 @@ public class BmNumLogsController extends BaseController { private BmNumLogsService bmNumLogsService; @GetMapping("/list") - public TableDataInfo list() { + public TableDataInfo list(BmNumLogs record) { startPage(); - List list = bmNumLogsService.selectAll(); + List list = bmNumLogsService.selectAll(record); return getDataTable(list); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java index 62b9dfb5..3e8bbe1d 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java @@ -15,7 +15,7 @@ public interface BmNumLogsMapper { BmNumLogs selectByPrimaryKey(Integer id); - List selectAll(); + List selectAll(BmNumLogs record); int updateByPrimaryKeySelective(BmNumLogs record); diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java index d6fc772a..60d0845a 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java @@ -24,8 +24,8 @@ public class BmNumLogsService{ return bmNumLogsMapper.insert(record); } - public List selectAll() { - return bmNumLogsMapper.selectAll(); + public List selectAll(BmNumLogs record) { + return bmNumLogsMapper.selectAll(record); } public int insertSelective(BmNumLogs record) { diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml index 9d8460e1..862f1c4f 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml @@ -8,7 +8,10 @@ + + + @@ -25,18 +28,32 @@ - From 0cce767acd65472278005d093a0562d98694fad2 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 29 Apr 2024 17:06:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/inventoryLogs/index.vue | 26 ++++++----------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/sgzb-ui/src/views/inventoryLogs/index.vue b/sgzb-ui/src/views/inventoryLogs/index.vue index 23da27ed..4c49fc98 100644 --- a/sgzb-ui/src/views/inventoryLogs/index.vue +++ b/sgzb-ui/src/views/inventoryLogs/index.vue @@ -4,22 +4,10 @@ - + - - - - + + 搜索 @@ -34,8 +22,8 @@ - - + + @@ -89,8 +77,8 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - modelTitle:'', - time:'' + modelTitle:'', // 规格名称 + typeName:'' // 模块名称 }, tableList: [], total: 5,