dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新货品审核的字典

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2023-10-31 18:08:17 +08:00
parent 9ea5b605ad
commit 3b64ce321f
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fuintAdmin/src/views/convenienceStore/damage/details.vue
View File

@ -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: '取消',

6
fuintAdmin/src/views/convenienceStore/inventory/details.vue
View File

@ -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 {

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtDamageServiceImpl.java
View File

@ -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.查询所有的数据

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryServiceImpl.java
View File

@ -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.查询所有的数据