diff --git a/src/controllers/05-quotation-controller.ts b/src/controllers/05-quotation-controller.ts index 962070b..bce1bde 100644 --- a/src/controllers/05-quotation-controller.ts +++ b/src/controllers/05-quotation-controller.ts @@ -190,6 +190,7 @@ export class QuotationController extends Controller { @Query() payCondition?: PayCondition, @Query() status?: QuotationStatus, @Query() urgentFirst?: boolean, + @Query() code?: string, @Query() query = "", ) { const where = { @@ -209,6 +210,7 @@ export class QuotationController extends Controller { }, }, ]), + code, payCondition, registeredBranch: isSystem(req.user) ? undefined : { OR: permissionCond(req.user) }, quotationStatus: status, diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts index 834b0fe..371ee29 100644 --- a/src/controllers/06-request-list-controller.ts +++ b/src/controllers/06-request-list-controller.ts @@ -73,9 +73,11 @@ export class RequestDataController extends Controller { @Query() query: string = "", @Query() requestDataStatus?: RequestDataStatus, @Query() quotationId?: string, + @Query() code?: string, ) { const where = { OR: queryOrNot(query, [ + { code: { contains: query, mode: "insensitive" } }, { quotation: { code: { contains: query, mode: "insensitive" } } }, { quotation: { workName: { contains: query } } }, { @@ -109,6 +111,7 @@ export class RequestDataController extends Controller { }, }, ]), + code, requestDataStatus, quotation: { id: quotationId,