From 6f336c5ec51466bd129780bde0627b8e0f7dda85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Thu, 14 Aug 2025 16:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=91=E7=8E=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasProductPortController.java | 16 ++ ruoyi-ui/src/views/bas/basSupplier/index.vue | 5 + ruoyi-ui/src/views/bas/cargoSpace/index.vue | 2 +- ruoyi-ui/src/views/bas/port/index.vue | 7 + ruoyi-ui/src/views/bas/warehouse/index.vue | 13 +- ruoyi-ui/src/views/check/create/index.vue | 2 +- ruoyi-ui/src/views/check/flat/index.vue | 11 +- ruoyi-ui/src/views/out/addOutStockout.vue | 8 +- .../src/views/requestInterface/log/index.vue | 138 +++++++++--------- ruoyi-ui/src/views/stock/freeze/index.vue | 36 ++--- ruoyi-ui/src/views/stock/record/index.vue | 36 ++--- 11 files changed, 157 insertions(+), 117 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/port/controller/BasProductPortController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/port/controller/BasProductPortController.java index bd8b61a..3208523 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/port/controller/BasProductPortController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/port/controller/BasProductPortController.java @@ -77,6 +77,13 @@ public class BasProductPortController extends BaseController @PostMapping public AjaxResult add(@RequestBody BasProductPort basProductPort) { + // 检查点位名称是否重复 + BasProductPort checkPort = new BasProductPort(); + checkPort.setPortName(basProductPort.getPortName()); + List existingPorts = basProductPortService.selectBasProductPortList(checkPort); + if (!existingPorts.isEmpty()) { + return error("点位名称已存在，请使用其他名称"); + } return toAjax(basProductPortService.insertBasProductPort(basProductPort)); } @@ -88,6 +95,15 @@ public class BasProductPortController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BasProductPort basProductPort) { + // 检查点位名称是否重复（排除当前记录） + BasProductPort checkPort = new BasProductPort(); + checkPort.setPortName(basProductPort.getPortName()); + List existingPorts = basProductPortService.selectBasProductPortList(checkPort); + for (BasProductPort existingPort : existingPorts) { + if (!existingPort.getId().equals(basProductPort.getId())) { + return error("点位名称已存在，请使用其他名称"); + } + } return toAjax(basProductPortService.updateBasProductPort(basProductPort)); } diff --git a/ruoyi-ui/src/views/bas/basSupplier/index.vue b/ruoyi-ui/src/views/bas/basSupplier/index.vue index d43cc53..5533741 100644 --- a/ruoyi-ui/src/views/bas/basSupplier/index.vue +++ b/ruoyi-ui/src/views/bas/basSupplier/index.vue @@ -498,4 +498,9 @@ export default { width: auto; min-width: fit-content; } +/* 统一表单控件宽度 */ +.el-select, +.el-input { + width: 100%; +} diff --git a/ruoyi-ui/src/views/bas/cargoSpace/index.vue b/ruoyi-ui/src/views/bas/cargoSpace/index.vue index 945d0be..ba90ed6 100644 --- a/ruoyi-ui/src/views/bas/cargoSpace/index.vue +++ b/ruoyi-ui/src/views/bas/cargoSpace/index.vue @@ -199,7 +199,7 @@ - + diff --git a/ruoyi-ui/src/views/bas/port/index.vue b/ruoyi-ui/src/views/bas/port/index.vue index 585882e..e9f0433 100644 --- a/ruoyi-ui/src/views/bas/port/index.vue +++ b/ruoyi-ui/src/views/bas/port/index.vue @@ -486,3 +486,10 @@ export default { } } + diff --git a/ruoyi-ui/src/views/bas/warehouse/index.vue b/ruoyi-ui/src/views/bas/warehouse/index.vue index 9644576..1edf4ae 100644 --- a/ruoyi-ui/src/views/bas/warehouse/index.vue +++ b/ruoyi-ui/src/views/bas/warehouse/index.vue @@ -398,14 +398,14 @@ export default { if (valid) { if (this.title === this.$t('warehouse.editWarehouseItem')) { updateWarehouse(this.form).then(response => { - this.$modal.msgSuccess(this.$t('warehouse.editsuccessInfo')) + this.$modal.msgSuccess(this.$t('warehouse.editSuccessInfo')) this.open = false this.getList() }) } if (this.title === this.$t('warehouse.addWarehouseItem')) { addWarehouse(this.form).then(response => { - this.$modal.msgSuccess(this.$t('warehouse.addsuccessInfo')) + this.$modal.msgSuccess(this.$t('warehouse.addSuccessInfo')) this.open = false this.getList() }) @@ -420,7 +420,7 @@ export default { return delWarehouse(warehouseIds) }).then(() => { this.getList() - this.$modal.msgSuccess(this.$t('warehouse.deletesuccessInfo')) + this.$modal.msgSuccess(this.$t('warehouse.deleteSuccessInfo')) }).catch(() => {}) }, /** 导出按钮操作 */ @@ -449,3 +449,10 @@ export default { } } + diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue index 9bcf7e0..845a183 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -206,7 +206,7 @@ warehouseId: [ { required: true, message: this.$t('checkCreate.warehouseRequired'), trigger: "change" } ], - billType: [ + checkType: [ { required: true, message: this.$t('checkCreate.documentTypeRequired'), trigger: "change" } ] }, diff --git a/ruoyi-ui/src/views/check/flat/index.vue b/ruoyi-ui/src/views/check/flat/index.vue index 3b375c6..f2c76e5 100644 --- a/ruoyi-ui/src/views/check/flat/index.vue +++ b/ruoyi-ui/src/views/check/flat/index.vue @@ -198,9 +198,6 @@ /> - - - @@ -527,3 +524,11 @@ export default { } } + + diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue index 4f5a797..6c7d6f5 100644 --- a/ruoyi-ui/src/views/out/addOutStockout.vue +++ b/ruoyi-ui/src/views/out/addOutStockout.vue @@ -129,13 +129,13 @@ export default { // 表单验证规则 rules: { warehouseId: [ - { required: true, message: "请选择仓库", trigger: "change" } + { required: true, message: this.$t('addOutStockout.selectWarehouse'), trigger: "change" } ], customerNo: [ - { required: true, message: "请输入客户编号", trigger: "blur" } + { required: true, message: this.$t('addOutStockout.inputCustomerNo'), trigger: "blur" } ], - billType: [ - { required: true, message: "请选择单据类型", trigger: "change" } + outType: [ + { required: true, message: this.$t('addOutStockout.selectDocumentType'), trigger: "change" } ] }, // 主表数据 diff --git a/ruoyi-ui/src/views/requestInterface/log/index.vue b/ruoyi-ui/src/views/requestInterface/log/index.vue index 3564089..7d1219a 100644 --- a/ruoyi-ui/src/views/requestInterface/log/index.vue +++ b/ruoyi-ui/src/views/requestInterface/log/index.vue @@ -20,7 +20,7 @@ - - 新增 - - - 修改 - - - 删除 - - - 导出 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86,40 +86,40 @@ - + - - - + + + - - - + + + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + +