คำสั่งยกเลิก
This commit is contained in:
parent
4b7ca5fbf4
commit
a17ca1a7d8
2 changed files with 5 additions and 5 deletions
|
|
@ -667,9 +667,9 @@ export class CommandController extends Controller {
|
||||||
*/
|
*/
|
||||||
@Delete("tab2Cancel17/{refId}")
|
@Delete("tab2Cancel17/{refId}")
|
||||||
async DeleteTab2Cancel17(@Path() refId: string, @Request() request: RequestWithUser) {
|
async DeleteTab2Cancel17(@Path() refId: string, @Request() request: RequestWithUser) {
|
||||||
await new permission().PermissionUpdate(request, "COMMAND");
|
// await new permission().PermissionUpdate(request, "COMMAND");
|
||||||
const commandRecive = await this.commandReciveRepository.findOne({
|
const commandRecive = await this.commandReciveRepository.findOne({
|
||||||
where: { refId: refId, command: { commandType: { commandCode: "C-PM-17" } } },
|
where: { refId: refId, command: { commandType: { code: "C-PM-17" } } },
|
||||||
relations: ["command", "command.commandType"],
|
relations: ["command", "command.commandType"],
|
||||||
});
|
});
|
||||||
if (!commandRecive) {
|
if (!commandRecive) {
|
||||||
|
|
@ -711,9 +711,9 @@ export class CommandController extends Controller {
|
||||||
*/
|
*/
|
||||||
@Delete("tab2Cancel23/{refId}")
|
@Delete("tab2Cancel23/{refId}")
|
||||||
async DeleteTab2Cancel23(@Path() refId: string, @Request() request: RequestWithUser) {
|
async DeleteTab2Cancel23(@Path() refId: string, @Request() request: RequestWithUser) {
|
||||||
await new permission().PermissionUpdate(request, "COMMAND");
|
// await new permission().PermissionUpdate(request, "COMMAND");
|
||||||
const commandRecive = await this.commandReciveRepository.findOne({
|
const commandRecive = await this.commandReciveRepository.findOne({
|
||||||
where: { refId: refId, command: { commandType: { commandCode: "C-PM-23" } } },
|
where: { refId: refId, command: { commandType: { code: "C-PM-23" } } },
|
||||||
relations: ["command", "command.commandType"],
|
relations: ["command", "command.commandType"],
|
||||||
});
|
});
|
||||||
if (!commandRecive) {
|
if (!commandRecive) {
|
||||||
|
|
|
||||||
|
|
@ -2530,7 +2530,7 @@ export class ImportDataController extends Controller {
|
||||||
.toISOString()
|
.toISOString()
|
||||||
.replace("T", " ")
|
.replace("T", " ")
|
||||||
.substring(0, 19);
|
.substring(0, 19);
|
||||||
profileSalary.remark = item.SalaryRef + item.PositionName;
|
profileSalary.remark = `${item.SalaryRef} ${item.PositionName}`;
|
||||||
profileSalary.amount = item.Amount;
|
profileSalary.amount = item.Amount;
|
||||||
profileSalary.positionSalaryAmount = item.PositionSalaryAmount;
|
profileSalary.positionSalaryAmount = item.PositionSalaryAmount;
|
||||||
// const str = item.PosNoName;
|
// const str = item.PosNoName;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue