From 6e6694eb2733924e6caa76138ccb2f5c7cb8d123 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Fri, 7 Jun 2024 17:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=B5=81=E7=A8=8B=E5=8F=8A?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseCheckServiceCenterMapper.java | 7 + ...PurchaseCheckServiceCenterServiceImpl.java | 4 +- .../PurchaseCheckServiceCenterMapper.xml | 16 ++ .../mapper/material/StorageStatusMapper.xml | 2 + .../newDevicesServiceCenterList.vue | 4 +- .../newPurchase/serviceCenter/index.vue | 185 ++++++++++-------- .../toolsAcceptance/component/home.vue | 63 ++++-- .../toolsAcceptance/component/queryTools.vue | 2 +- .../warehousing/newTools/index.vue | 136 +++++++------ 9 files changed, 260 insertions(+), 159 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java index c8cafee7..3eab08dd 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java @@ -227,4 +227,11 @@ public interface PurchaseCheckServiceCenterMapper * @return */ int isOperateAllNot(MaInputRecord maInputRecord); + + /** + * 查询审核的数据 + * @param taskId + * @return + */ + List selectPutinDetailsCheck(Long taskId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java index b7cf726f..588630fb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java @@ -145,7 +145,9 @@ public class PurchaseCheckServiceCenterServiceImpl implements PurchaseCheckServi public AjaxResult modifyManageStatus(MaInputVO maInputVO) { Long taskId = maInputVO.getTaskId(); String checkResult = maInputVO.getCheckResult(); - List inputRecordList = maInputVO.getInputRecordList(); + //查询审核的数据 + List inputRecordList = purchaseCheckServiceCenterMapper.selectPutinDetailsCheck(taskId); +// List inputRecordList = maInputVO.getInputRecordList(); for (MaInputRecord maInputRecord : inputRecordList) { //判断是编码设备还是数量 if (StringHelper.isNotEmpty(maInputRecord.getMaCode())) { 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 ac8803a2..03d6271e 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 @@ -463,4 +463,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND type_id = #{typeId} AND `status` != '4' + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml index 28b90587..214d020f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml @@ -81,7 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM purchase_check_details pcd LEFT JOIN ma_type mt ON mt.type_id = pcd.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + LEFT JOIN tm_task tt on tt.task_id=pcd.task_id WHERE IFNULL(pcd.check_num, 0) - IFNULL(pcd.input_num, 0) > 0 + and tt.task_status !=107 and tt.task_status !=106 GROUP BY mt.type_id) AS subquery4 ON subquery4.type_id = mt.type_id LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id WHERE mt.`level` = 4 diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue index 220647b5..676dfa99 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue @@ -757,7 +757,7 @@ export default { let param = { taskId: this.query.taskId, checkResult: '1', - inputRecordList: this.ids, + // inputRecordList: this.ids, } changePutinStatus(param).then((response) => { if (response.code == 200) { @@ -810,7 +810,7 @@ export default { let param = { taskId: this.query.taskId, checkResult: '2', - inputRecordList: this.ids, + // inputRecordList: this.ids, } changePutinStatus(param).then((response) => { diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue index 2d5c6190..76e8ad96 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue @@ -38,6 +38,23 @@ + + + + + + 审核重置 --> - - - 批量通过 - - - 批量不通过 - - - - - - - - - - - - - - + + + 通过 + + + 不通过 + + + + + + + + + - - - + + { + this.showBatchButtons = this.detailTableList.some(item => item.taskStatus === '122'); + }, { deep: true }); + }, created() { this.getList() this.getTypeList() @@ -625,6 +646,7 @@ export default { startTime: this.queryParams.time && this.queryParams.time[0], endTime: this.queryParams.time && this.queryParams.time[1], typeId: this.queryParams.typeId, + taskStatus: this.queryParams.taskState, pageSize: this.queryParams.pageSize, pageNum: this.queryParams.pageNum, } @@ -641,6 +663,7 @@ export default { this.detailTableList = response.rows this.dialogTotal = response.total this.loading = false + this.ids = response.rows.map((item) => item) }) }, @@ -685,12 +708,14 @@ export default { return false } }, - // 多选框选中数据 - 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) { // this.reset(); diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue index e8e53f40..26e95a43 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue @@ -38,6 +38,23 @@ + + + + + + 验收单提交审核 @@ -229,10 +243,10 @@ type="text" icon="el-icon-delete" v-if=" - scope.row.purchasingStatus != '已入库' && - scope.row.purchasingStatus != '已审核' && - scope.row.purchasingStatus != '已验收合格' && - scope.row.purchasingStatus != '待审核' + scope.row.purchasingStatus == '待通知' || + scope.row.purchasingStatus == '验收未通过' || + scope.row.purchasingStatus == '综合服务中心未通过' || + scope.row.purchasingStatus == '入库审核未通过' " @click="handleDelete(scope.row)" v-hasPermi="['newPurchase:tools:del']" @@ -492,6 +506,20 @@ export default { //搜索下拉数据 typesList: [], modelList: [], + // 采购状态下拉数据 + statusList: [ + { label: '全部', taskState: null }, + { label: '待通知', taskState: 24 }, + { label: '待验收', taskState: 25 }, + { label: '验收合格', taskState: 26 }, + { label: '验收未通过', taskState: 27 }, + { label: '综合服务中心审核中', taskState: 122 }, + { label: '综合服务中心未通过', taskState: 106 }, + { label: '入库审核中', taskState: 105 }, + { label: '入库审核未通过', taskState: 107 }, + { label: '部分已入库', taskState: 123 }, + { label: '已全部入库', taskState: 28 } + ], // 字典表格数据 typeList: [], // 弹出层标题 @@ -533,6 +561,7 @@ export default { startTime: this.queryParams.time && this.queryParams.time[0], endTime: this.queryParams.time && this.queryParams.time[1], typeId: this.queryParams.typeId, + taskStatus: this.queryParams.taskState, pageSize: this.queryParams.pageSize, pageNum: this.queryParams.pageNum, } diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue index d445bd4f..3ae4b098 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue @@ -241,7 +241,7 @@ v-model="form.checkNum" style="width: 100%" controls-position="right" - :min="1" + :min="0" :max="form.purchaseNum" /> diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue index 6ca48ea1..14b0627d 100644 --- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue +++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue @@ -9,6 +9,41 @@ v-show="showSearch" label-width="100px" > + + + + + + + + + + + + + - - - - - + @@ -179,7 +199,6 @@ type="text" icon="el-icon-edit" v-if=" - scope.row.taskStatus == '26' || scope.row.taskStatus == '105' " @click="handleUpdate(scope.row)" @@ -190,7 +209,7 @@ size="mini" type="text" icon="el-icon-edit" - v-if="scope.row.taskStatus == '28'" + v-if="scope.row.taskStatus == '28' || scope.row.taskStatus == '123'" @click="handlePrint(scope.row)" v-hasPermi="['warehousing:newTools:list']" >入库单 --> @@ -363,7 +383,7 @@ size="mini" type="text" v-if=" - scope.row.status == '0' && + (scope.row.status == '0' || scope.row.status == '3') && scope.row.userIds.includes(userId) " @click="pass(scope.row)" @@ -373,7 +393,7 @@ size="mini" type="text" v-if=" - scope.row.status == '0' && + (scope.row.status == '0' || scope.row.status == '3') && scope.row.userIds.includes(userId) " @click="refused(scope.row)" @@ -675,19 +695,19 @@ export default { }, //是否可用勾选框 selectable(row) { - console.log(row) - if (row.status == '0') { - if ( - (row.manageType == '0' && row.maCode) || - row.manageType == '1' - ) { - return true - } else { - return false - } + console.log(row) + if (row.status == '0' || row.status == '3') { + if ( + (row.manageType == '0' && row.maCode) || + row.manageType == '1' + ) { + return true } else { - return false + return false } + } else { + return false + } }, // 多选框选中数据 handleSelectionChange(selection) {