From 75895eaa5630757036bd0d2bd81fc8b0c10014e4 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Fri, 7 Jun 2024 09:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=B5=81=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/domain/PurchaseMacodeInfo.java | 12 ++ .../PurchaseCheckServiceCenterMapper.xml | 2 + .../material/PurchaseMacodeInfoMapper.xml | 138 ++++++++++-------- .../newDevicesServiceCenterList.vue | 138 ++++++++---------- .../newDevices/newDevicesWarehousing.vue | 2 +- 5 files changed, 156 insertions(+), 136 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java index 1eeec65d..dd90d49b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java @@ -29,6 +29,10 @@ public class PurchaseMacodeInfo extends BaseEntity @ApiModelProperty(value = "任务ID") private Long taskId; + /** 任务状态 */ + @ApiModelProperty(value = "任务状态") + private String taskStatus; + /** 类型ID */ @ApiModelProperty(value = "类型ID") private Long typeId; @@ -147,6 +151,14 @@ public class PurchaseMacodeInfo extends BaseEntity @ApiModelProperty(value = "0,正常 1, 重复数据") private int statusFlag; + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String taskStatus) { + this.taskStatus = taskStatus; + } + public Long getId() { return id; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml index 334b9c3f..ac8803a2 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml @@ -375,6 +375,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pmi.fix_code fixCode, pcd.type_id typeId, pcd.task_id taskId, + tt.task_status taskStatus, mt.code specsCode, mt1.code typeCode, CASE @@ -393,6 +394,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" if(pmi.ma_code is not null, 1, pcd.check_num) checkNum from purchase_check_details pcd left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id + LEFT JOIN tm_task tt on tt.task_id=pcd.task_id left join ma_machine mm on pmi.ma_code = mm.ma_code left join ma_type mt on pcd.type_id = mt.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index 3124dbc3..ca035e57 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -353,48 +353,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT user_id FROM ma_type_keeper WHERE type_id = #{typeId} + + + update ma_type set num = #{num} where type_id = #{typeId} diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue index 0a0cd289..220647b5 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue @@ -245,53 +245,38 @@ @click="handleDialogQuery" >查询 - - - - 批量通过 - - - 批量不通过 - - - - - - - - - - - - + + + 通过 + + + 不通过 + + - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + { + this.showBatchButtons = this.detailTableList.some(item => item.taskStatus === '122'); + }, { deep: true }); + }, + created() { this.getList() this.getTypeList() }, @@ -668,6 +653,7 @@ export default { this.detailTableList = response.rows this.dialogTotal = response.total this.loading = false + this.ids = response.rows.map((item) => item) }) }, @@ -713,10 +699,12 @@ export default { } }, // 多选框选中数据 - handleSelectionChange(selection) { - this.ids = selection.map((item) => item) - this.single = selection.length != 1 - this.multiple = !selection.length + handleSelectionChange() { + console.log(this.ids) + this.ids = this.detailTableList.map((item) => item) // 假设数据的唯一标识为 id + console.log(this.ids) + // this.single = selection.length != 1 + // this.multiple = !selection.length }, /** 修改按钮操作 */ handleUpdate(row) { diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue index c1b39eaf..dfb4be85 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue @@ -156,7 +156,7 @@