From e9545c678406a786be00ec5fd2a14ecb3b6966c4 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 26 Dec 2024 20:24:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=8E=BB=E6=8E=89=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E3=80=81=E4=B8=9A=E5=8A=A1=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E5=AE=A1=E6=A0=B8=E3=80=81=E6=80=BB=E5=8A=A9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/system/salesOrder/add.html | 2 +- .../resources/templates/system/salesOrder/taskYwjlVerify.html | 2 +- .../resources/templates/system/salesOrder/taskZozjVerify.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index 9caa3d90..1320db08 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -461,7 +461,7 @@ }, format: function (value, row, index) { return value + "天数";} }, - {field: 'remark',align: 'center',title: '备注',}, + {field: 'remark',align: 'center',title: '备注',visible: false,}, {title: '操作', align: 'center', formatter: function (value, row, index) { diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html index 3eddc232..624d839f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html @@ -389,7 +389,7 @@ { title: '计划交付时间',field: 'deliveryTime',align: 'center' }, {title: '质保天数',align: 'center',field: 'expiryDay', }, - {field: 'remark',align: 'center',title: '备注',}, + {field: 'remark',align: 'center',title: '备注',visible: false,}, {field: 'auditStatus',align: 'center',title: '审核状态',visible: false, formatter: function(value, row, index) { return $.table.selectDictLabel(auditStatusDatas, value); diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html index c79cc9df..3e0b5539 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html @@ -389,7 +389,7 @@ { title: '计划交付时间',field: 'deliveryTime',align: 'center' }, {title: '质保天数',align: 'center',field: 'expiryDay', }, - {field: 'remark',align: 'center',title: '备注',}, + {field: 'remark',align: 'center',title: '备注',visible: false,}, {field: 'auditStatus',align: 'center',title: '审核状态',visible: false, formatter: function(value, row, index) { return $.table.selectDictLabel(auditStatusDatas, value); From 9aa0a4251530ef9dc0d70d59a1bde7cb524f12ac Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 26 Dec 2024 20:27:50 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=9D=A5=E6=BA=90=E4=B8=BA=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=AF=A5=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E5=87=BA=E8=A1=8C=E6=9F=A5=E8=AF=A2=E4=B8=BA=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseStorageOrderServiceImpl.java | 197 ++++++++++-------- 1 file changed, 105 insertions(+), 92 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index 2ac28d4e..a719ad53 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.warehouse.service.impl; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -1829,109 +1831,120 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS // 新增采购入库库存历史记录 String purchasePlanCode = purchaseOrderMapper.selectPurchasePlanCodeByCode(correlationCode); - PurchasePlan purchasePlan = purchasePlanMapper.selectPurchasePlanByPlanCode(purchasePlanCode); - if ("2".equals(purchasePlan.getPurchasePlanType())){ //来源为请购单 - List purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); - for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { - if(purchaseOrderChild.getMaterialNo().equals(materialNo)){ - - WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); - Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal(); - historicalTotal += storageNum; - oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal); - - Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); - if (availableStockNum == null || availableStockNum == 0){ - availableStockNum = storageNum; - }else { - availableStockNum += storageNum; - } + List purchasePlanCodes = new ArrayList<>(); + if (StringUtils.isEmpty(purchasePlanCode)){ + throw new BusinessException("找不到与采购单号关联的采购计划号"); + } - oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); + if (StringUtils.isNotEmpty(purchasePlanCode)){ + String[] splitPurchasePlanCode = purchasePlanCode.split(","); + purchasePlanCodes = Arrays.asList(splitPurchasePlanCode); + } + + List purchasePlans = purchasePlanMapper.selectPurchaseOrderByPlanCodeList(purchasePlanCodes); + for (PurchasePlan purchasePlan : purchasePlans) { + if ("2".equals(purchasePlan.getPurchasePlanType())){ //来源为请购单 + List purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); + for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { + if(purchaseOrderChild.getMaterialNo().equals(materialNo)){ + + WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal(); + historicalTotal += storageNum; + oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal); + + Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); + if (availableStockNum == null || availableStockNum == 0){ + availableStockNum = storageNum; + }else { + availableStockNum += storageNum; + } + + oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); // Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo); // oldWarehouseInventoryInquiry.setAvailableStockNum(oldAvailableStockNum + storageNum); //加上本次入库的数量 - Integer sharedAvailableStockNum = oldWarehouseInventoryInquiry.getSharedAvailableStockNum();//共享可用库存 - if (sharedAvailableStockNum == null || sharedAvailableStockNum == 0){ - sharedAvailableStockNum = storageNum; - }else { - sharedAvailableStockNum += storageNum; - } - oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum); - - int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); - if (updateResult <= 0){ - throw new BusinessException("更新库存查询记录失败！"); - } - - remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); - - WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); - inquiryDetail.setMaterialNo(materialNo); - inquiryDetail.setInquiryWarehouseType("0");//采购入库 - inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); - inquiryDetail.setInquiryOrderType("0"); - inquiryDetail.setInquiryBusinessType("0"); - inquiryDetail.setCorrelationCode(storageCode); - inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum()); - inquiryDetail.setInventoryIncreaseDecrease("1"); - int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); - if (insertDetailResult <= 0){ - throw new BusinessException("新增库存履历失败！"); + Integer sharedAvailableStockNum = oldWarehouseInventoryInquiry.getSharedAvailableStockNum();//共享可用库存 + if (sharedAvailableStockNum == null || sharedAvailableStockNum == 0){ + sharedAvailableStockNum = storageNum; + }else { + sharedAvailableStockNum += storageNum; + } + oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum); + + int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); + if (updateResult <= 0){ + throw new BusinessException("更新库存查询记录失败！"); + } + + remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); + + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail.setMaterialNo(materialNo); + inquiryDetail.setInquiryWarehouseType("0");//采购入库 + inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); + inquiryDetail.setInquiryOrderType("0"); + inquiryDetail.setInquiryBusinessType("0"); + inquiryDetail.setCorrelationCode(storageCode); + inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum()); + inquiryDetail.setInventoryIncreaseDecrease("1"); + int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + if (insertDetailResult <= 0){ + throw new BusinessException("新增库存履历失败！"); + } } } - } - }else if ("1".equals(purchasePlan.getPurchasePlanType())){ //生产订单 - List purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); - for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { - if (purchaseOrderChild.getMaterialNo().equals(materialNo)) { - - WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); - Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal(); - historicalTotal += storageNum; - oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal); - Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); - if (availableStockNum == null || availableStockNum == 0){ - availableStockNum = storageNum; - }else { - availableStockNum += storageNum; - } - - oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); + }else if ("1".equals(purchasePlan.getPurchasePlanType())){ //生产订单 + List purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); + for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { + if (purchaseOrderChild.getMaterialNo().equals(materialNo)) { + + WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal(); + historicalTotal += storageNum; + oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal); + Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); + if (availableStockNum == null || availableStockNum == 0){ + availableStockNum = storageNum; + }else { + availableStockNum += storageNum; + } + + oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); // Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo); - Integer fixedAvailableStockNum = oldWarehouseInventoryInquiry.getFixedAvailableStockNum();//固定可用库存 - if (fixedAvailableStockNum == null || fixedAvailableStockNum == 0){ - fixedAvailableStockNum = storageNum; - }else { - fixedAvailableStockNum += storageNum; - } - oldWarehouseInventoryInquiry.setFixedAvailableStockNum(fixedAvailableStockNum); - - - int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); - if (updateResult <= 0) { - throw new BusinessException("更新库存查询记录失败！"); - } - - remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); - - WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); - inquiryDetail.setMaterialNo(materialNo); - inquiryDetail.setInquiryWarehouseType("0");//采购入库 - inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); - inquiryDetail.setInquiryOrderType("0"); - inquiryDetail.setInquiryBusinessType("0"); - inquiryDetail.setCorrelationCode(storageCode); - inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum()); - inquiryDetail.setInventoryIncreaseDecrease("1"); - int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); - if (insertDetailResult <= 0) { - throw new BusinessException("新增库存履历失败！"); + Integer fixedAvailableStockNum = oldWarehouseInventoryInquiry.getFixedAvailableStockNum();//固定可用库存 + if (fixedAvailableStockNum == null || fixedAvailableStockNum == 0){ + fixedAvailableStockNum = storageNum; + }else { + fixedAvailableStockNum += storageNum; + } + oldWarehouseInventoryInquiry.setFixedAvailableStockNum(fixedAvailableStockNum); + + + int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); + if (updateResult <= 0) { + throw new BusinessException("更新库存查询记录失败！"); + } + + remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); + + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail.setMaterialNo(materialNo); + inquiryDetail.setInquiryWarehouseType("0");//采购入库 + inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); + inquiryDetail.setInquiryOrderType("0"); + inquiryDetail.setInquiryBusinessType("0"); + inquiryDetail.setCorrelationCode(storageCode); + inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum()); + inquiryDetail.setInventoryIncreaseDecrease("1"); + int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + if (insertDetailResult <= 0) { + throw new BusinessException("新增库存履历失败！"); + } } } } } - }else if(warehouseStorageType.equals("5")){//新增生产入库库存历史记录 WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); From 6a9d700b580c40f902c688773a68308019c3cb62 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 26 Dec 2024 20:42:02 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84?= =?UTF-8?q?=E6=96=99=20=E5=85=AC=E5=8F=B8=E9=93=B6=E8=A1=8C=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=A4=B4=E5=92=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=A4=B4=E5=92=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=A4=B4=E5=92=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=A4=B4=E5=92=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=A4=B4=E5=92=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../companyBankInfo/companyBankInfo.html | 7 ++++--- .../resources/templates/system/dept/dept.html | 13 ++++++------ .../resources/templates/system/post/post.html | 13 ++++++------ .../templates/system/role/authUser.html | 9 ++++---- .../resources/templates/system/role/role.html | 21 ++++++++++--------- .../resources/templates/system/user/user.html | 21 ++++++++++--------- 6 files changed, 45 insertions(+), 39 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html b/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html index 82604897..15877a37 100644 --- a/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html +++ b/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html @@ -118,9 +118,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('删除 '); - return actions.join(''); + actions.push('编辑 '); + actions.push('删除 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/dept.html b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html index a189d73e..2e09ec97 100644 --- a/ruoyi-admin/src/main/resources/templates/system/dept/dept.html +++ b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html @@ -32,10 +32,10 @@ 新增 - + 修改 - + 展开/折叠 @@ -100,10 +100,11 @@ formatter: function(value, row, index) { if (row.parentId != 0) { var actions = []; - actions.push('编辑 '); - actions.push('新增 '); - actions.push('删除'); - return actions.join(''); + actions.push('编辑 '); + actions.push('新增 '); + actions.push('删除'); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } else { return ""; } diff --git a/ruoyi-admin/src/main/resources/templates/system/post/post.html b/ruoyi-admin/src/main/resources/templates/system/post/post.html index 3c3fc42d..13dd41f0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/post/post.html +++ b/ruoyi-admin/src/main/resources/templates/system/post/post.html @@ -35,13 +35,13 @@ 新增 - + 修改 - + 删除 - + 导出 @@ -107,9 +107,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); + actions.push('编辑 '); + actions.push('删除'); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/role/authUser.html b/ruoyi-admin/src/main/resources/templates/system/role/authUser.html index 7d080401..8b2d370f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/authUser.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/authUser.html @@ -30,10 +30,10 @@ 添加用户 - + 批量取消授权 - + 关闭 @@ -105,8 +105,9 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('取消授权 '); - return actions.join(''); + actions.push('取消授权 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/role/role.html b/ruoyi-admin/src/main/resources/templates/system/role/role.html index 7cbc4880..f155e56e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/role.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/role.html @@ -41,16 +41,16 @@ 新增 - + 修改 - + 删除 - + 导出 - + 导出角色权限 @@ -117,13 +117,14 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('删除 '); + actions.push('编辑 '); + actions.push('删除 '); var more = []; - more.push("数据权限 "); - more.push("分配用户"); - actions.push('更多操作'); - return actions.join(''); + more.push("数据权限 "); + more.push("分配用户"); + actions.push('更多操作'); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html index 34d815ef..6ea21c72 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/user.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html @@ -65,16 +65,16 @@ 新增 - + 修改 - + 删除 - + 导入 - + 导出 @@ -172,13 +172,14 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('删除 '); + actions.push('编辑 '); + actions.push('删除 '); var more = []; - more.push("重置密码 "); - more.push("分配角色"); - actions.push('更多操作'); - return actions.join(''); + more.push("重置密码 "); + more.push("分配角色"); + actions.push('更多操作'); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; From cca60694a740a637494818fa7dbf59b154ce9e5a Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 26 Dec 2024 20:53:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=92=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=87=87?= =?UTF-8?q?=E7=94=A8=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=20=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E9=A2=86=E6=96=99=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E5=92=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E5=92=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../developModifyOrder/developModifyOrder.html | 2 ++ .../developModifyorderPicking.html | 15 ++++++++------- .../resources/templates/system/model/model.html | 9 +++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html index 0896c3fa..38635647 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html @@ -109,6 +109,8 @@ restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", modalName: "开发修改单", + fixedColumns: true, // 启用冻结列 + fixedRightNumber: 1, // 冻结右列个数 columns: [ {checkbox: true}, {title: '开发修改单ID',field: 'developOrderId',visible: false}, diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html index 673a07d8..019212a0 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html @@ -45,7 +45,7 @@ @@ -222,7 +222,7 @@ // 审核状态-审核通过 if(row.auditStatus=="1"){ // 编辑 - actions.push('编辑 '); + actions.push('编辑 '); } // 有流程实例id if (row.instanceId) { @@ -231,17 +231,18 @@ var todoUserIdList = row.todoUserId.split(","); if(todoUserIdList.includes(loginName) || loginName == 'admin'){ var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; - actions.push(' '+nodeName+' '); + actions.push(' '+nodeName+' '); } } // 审批历史 - actions.push(' 审批历史 '); + actions.push(' 审批历史 '); // 进度查看 - actions.push(' 进度查看 '); + actions.push(' 进度查看 '); } // 详情 - actions.push('详情 '); - return actions.join(''); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/model/model.html b/ruoyi-admin/src/main/resources/templates/system/model/model.html index 171345e0..f0ec190b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/model/model.html +++ b/ruoyi-admin/src/main/resources/templates/system/model/model.html @@ -55,7 +55,7 @@ 添加 - + 导出 @@ -124,9 +124,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('详情 '); - return actions.join(''); + actions.push('编辑 '); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ] From 94c8fd3640a67aadca5a6bb29222198a7884180b Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 26 Dec 2024 20:58:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[fix]=20=E5=A7=94=E5=A4=96=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E5=92=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=20=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E9=A2=86=E6=96=99=E8=A1=A8=E5=A4=B4=E5=92=8C?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E5=A7=94=E5=A4=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E5=92=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../developModifyorderPicking.html | 2 ++ .../templates/system/outsource_plan/outsource_plan.html | 5 +++-- .../system/outsource_process/outsource_process.html | 7 ++++--- .../templates/system/outsource_storage/storage.html | 9 ++++++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html index 019212a0..814fd0c7 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html @@ -79,6 +79,8 @@ restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", modalName: "开发修改单领料", + fixedColumns: true, // 启用冻结列 + fixedRightNumber: 1, // 冻结右列个数 columns: [{ checkbox: true }, diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html index 7b4dde4f..55ba42ff 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html @@ -150,8 +150,9 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('详情 '); - return actions.join(''); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html b/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html index eaa5b672..df66bbf1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html @@ -103,9 +103,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('详情 '); - return actions.join(''); + actions.push('编辑 '); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html b/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html index 9020a295..c2bd34bb 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html @@ -48,7 +48,7 @@ @@ -77,6 +77,8 @@ removeUrl: prefix + "/remove", exportUrl: prefix + "/export", modalName: "委外入库", + fixedColumns: true, // 启用冻结列 + fixedRightNumber: 1, // 冻结右列个数 columns: [{ checkbox: true }, @@ -214,8 +216,9 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('详情 '); - return actions.join(''); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; From 8ada05120f4eb0d8d6f1346566fabdbd9d257083 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 26 Dec 2024 21:05:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[fix]=20=E7=BB=A9=E6=95=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E7=BB=A9=E6=95=88=E7=AE=A1=E7=90=86=E5=9B=9B?= =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=9D=97=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/erp/ctc/ctc.html | 14 +++++--------- .../src/main/resources/templates/erp/utb/utb.html | 12 ++++-------- .../system/technicalMerits/technicalMerits.html | 11 ++++++----- .../system/technicalTeam/technicalTeam.html | 7 ++++--- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/erp/ctc/ctc.html b/ruoyi-admin/src/main/resources/templates/erp/ctc/ctc.html index 9b3d8236..568c4cd7 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/ctc/ctc.html +++ b/ruoyi-admin/src/main/resources/templates/erp/ctc/ctc.html @@ -54,7 +54,7 @@ 删除 --> - + 导出 @@ -182,14 +182,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('删除 '); - if(row.delFlag == '0'){ - actions.push('作废 '); - }else{ - actions.push('恢复 '); - } - return actions.join(''); + actions.push('编辑 '); + actions.push('删除 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html index 63f5bcf2..bd3577ce 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html +++ b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html @@ -142,14 +142,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('删除 '); - if(row.delFlag == '0'){ - actions.push('作废 '); - }else{ - actions.push('恢复 '); - } - return actions.join(''); + actions.push('编辑 '); + actions.push('删除 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html index d793d22c..1f91d54e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html +++ b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html @@ -40,10 +40,10 @@ 添加 - + 导入已发放绩效 - + 导出 @@ -151,9 +151,10 @@ {title: '操作',align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('发放绩效 '); - actions.push('详情 '); - return actions.join(''); + actions.push('发放绩效 '); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html b/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html index 09be6cbd..18223939 100644 --- a/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html +++ b/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html @@ -115,9 +115,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('详情 '); - return actions.join(''); + actions.push('编辑 '); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ]