verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 69 Releases Wiki Activity

8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
Conversation 0 Commits 383 Files Changed 108 +1 -2
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e748c3ea68 - Show all commits

1
db/versions/10936-wheatAnthurium/00-updateACL.sql
View File

@ -2,6 +2,5 @@ INSERT IGNORE INTO salix.ACL (model,property,accessType,permission,principalType
VALUES VALUES
('Ticket','itemLack','READ','ALLOW','ROLE','employee'), ('Ticket','itemLack','READ','ALLOW','ROLE','employee'),
('Ticket','itemLackDetail','READ','ALLOW','ROLE','employee'), ('Ticket','itemLackDetail','READ','ALLOW','ROLE','employee'),
('Ticket','itemLackOrigin','WRITE','ALLOW','ROLE','employee'),
('Ticket','split','WRITE','ALLOW','ROLE','employee'), ('Ticket','split','WRITE','ALLOW','ROLE','employee'),
('Sale','replaceItem','WRITE','ALLOW','ROLE','employee'); ('Sale','replaceItem','WRITE','ALLOW','ROLE','employee');

2
modules/ticket/back/methods/ticket/itemLackDetail.js
View File

@ -37,7 +37,7 @@ module.exports = Self => {
if (typeof options == 'object') Object.assign(myOptions, options); if (typeof options == 'object') Object.assign(myOptions, options);
const vDated = (Date.vnNew()); const vDated = (Date.vnNew());
vDated.setHours(0, 0, 0, 0); vDated.setHours(0, 0, 0, 0);
const scopeDays = filter.where.scopeDays ?? 2; const scopeDays = filter.where.scopeDays ?? 0;
let alertLevels = filter.where.alertLevelCode; let alertLevels = filter.where.alertLevelCode;
if (!alertLevels) if (!alertLevels)