From 3b64ce321f1d53c064cfb62751aaf58d2fcb201d Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Tue, 31 Oct 2023 18:08:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B4=A7=E5=93=81=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=9A=84=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/convenienceStore/damage/details.vue | 13 ++++++------- .../views/convenienceStore/inventory/details.vue | 6 +++--- .../service/impl/MtDamageServiceImpl.java | 6 +++--- .../service/impl/MtInventoryServiceImpl.java | 6 +++--- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/fuintAdmin/src/views/convenienceStore/damage/details.vue b/fuintAdmin/src/views/convenienceStore/damage/details.vue index d3e3ff600..40722bf86 100644 --- a/fuintAdmin/src/views/convenienceStore/damage/details.vue +++ b/fuintAdmin/src/views/convenienceStore/damage/details.vue @@ -493,17 +493,17 @@ export default { // 判断按钮是否可用 async JudgmentButton(){ - let judgmentPermissions1 = await this.judgmentPermissions("退货审核"); + let judgmentPermissions1 = await this.judgmentPermissions("商品报损审核"); if (judgmentPermissions1 > 0){ this.auditFlag=false, this.voidFlag=false } - let judgmentPermissions2 = await this.judgmentPermissions("退货出库"); + let judgmentPermissions2 = await this.judgmentPermissions("商品报损出库"); if (judgmentPermissions2 > 0){ this.storageFlag = false } - let judgmentPermissions3 = await this.judgmentPermissions("退货废止"); + let judgmentPermissions3 = await this.judgmentPermissions("商品报损废止"); if (judgmentPermissions3 > 0){ this.voidFlag=false }else { @@ -526,13 +526,13 @@ export default { let this_ = this // 保存之前进行判断 if (this_.damageForm.orderNumber == null) { - this.$modal.msgError("退货单号不能为空"); + this.$modal.msgError("货损单号不能为空"); return -1; }else if (this_.damageForm.orderDate == null) { - this.$modal.msgError("退货时间不能为空"); + this.$modal.msgError("货损时间不能为空"); return -1; }else if(this_.detailsList.length<=0) { - this.$modal.msgError("退货单不能为空"); + this.$modal.msgError("货损单不能为空"); return -1; } @@ -597,7 +597,6 @@ export default { // 入库 storage() { let this_ = this; - this.$confirm('确认后货损中的对应商品出库商品库存将发生变化，且不可逆，确认已按照货损单数量出库吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/fuintAdmin/src/views/convenienceStore/inventory/details.vue b/fuintAdmin/src/views/convenienceStore/inventory/details.vue index 6d6fb210a..f949e947b 100644 --- a/fuintAdmin/src/views/convenienceStore/inventory/details.vue +++ b/fuintAdmin/src/views/convenienceStore/inventory/details.vue @@ -500,17 +500,17 @@ export default { // 判断按钮是否可用 async JudgmentButton(){ - let judgmentPermissions1 = await this.judgmentPermissions("退货审核"); + let judgmentPermissions1 = await this.judgmentPermissions("盘点商品审核"); if (judgmentPermissions1 > 0){ this.auditFlag=false, this.voidFlag=false } - let judgmentPermissions2 = await this.judgmentPermissions("退货出库"); + let judgmentPermissions2 = await this.judgmentPermissions("盘点商品入库"); if (judgmentPermissions2 > 0){ this.storageFlag = false } - let judgmentPermissions3 = await this.judgmentPermissions("退货废止"); + let judgmentPermissions3 = await this.judgmentPermissions("盘点商品废止"); if (judgmentPermissions3 > 0){ this.voidFlag=false }else { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtDamageServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtDamageServiceImpl.java index 694ef2588..791a5f9c6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtDamageServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtDamageServiceImpl.java @@ -144,7 +144,7 @@ public class MtDamageServiceImpl implements MtDamageService { @Override public boolean audit(Integer id) { - String oilIntake = "退货审核"; + String oilIntake = "商品报损审核"; int audit = iljStaffService.auditPrem(oilIntake); if (audit>0) { // 根据id修改状态 @@ -159,7 +159,7 @@ public class MtDamageServiceImpl implements MtDamageService { @Override public boolean abolition(Integer id) { - String oilIntake = "退货废止"; + String oilIntake = "商品报损废止"; int audit = iljStaffService.auditPrem(oilIntake); if (audit>0) { String status = "yzf"; @@ -176,7 +176,7 @@ public class MtDamageServiceImpl implements MtDamageService { @Transactional(rollbackFor = Exception.class) public boolean storage(Integer id) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - String oilIntake = "退货出库"; + String oilIntake = "商品报损出库"; int audit = iljStaffService.auditPrem(oilIntake); if (audit>0) { // 1.查询所有的数据 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryServiceImpl.java index 47a7bfeda..f17ef127f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryServiceImpl.java @@ -123,7 +123,7 @@ public class MtInventoryServiceImpl implements MtInventoryService { @Override public boolean audit(Integer id) { - String oilIntake = "退货审核"; + String oilIntake = "盘点商品审核"; int audit = iljStaffService.auditPrem(oilIntake); if (audit>0) { // 根据id修改状态 @@ -138,7 +138,7 @@ public class MtInventoryServiceImpl implements MtInventoryService { @Override public boolean abolition(Integer id) { - String oilIntake = "退货废止"; + String oilIntake = "盘点商品废止"; int audit = iljStaffService.auditPrem(oilIntake); if (audit>0) { String status = "yzf"; @@ -154,7 +154,7 @@ public class MtInventoryServiceImpl implements MtInventoryService { @Transactional(rollbackFor = Exception.class) public boolean storage(Integer id) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - String oilIntake = "退货出库"; + String oilIntake = "盘点商品入库"; int audit = iljStaffService.auditPrem(oilIntake); if (audit>0) { // 1.查询所有的数据