Merge branch 'develop'
This commit is contained in:
commit
26c1985773
2 changed files with 18 additions and 2 deletions
|
|
@ -352,7 +352,15 @@ export class RequestListController extends Controller {
|
||||||
include: {
|
include: {
|
||||||
request: {
|
request: {
|
||||||
include: {
|
include: {
|
||||||
quotation: true,
|
quotation: readyToTask
|
||||||
|
? {
|
||||||
|
include: {
|
||||||
|
customerBranch: {
|
||||||
|
include: { customer: true },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
: true,
|
||||||
employee: true,
|
employee: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -298,7 +298,15 @@ export class TaskController extends Controller {
|
||||||
request: {
|
request: {
|
||||||
include: {
|
include: {
|
||||||
employee: true,
|
employee: true,
|
||||||
quotation: true,
|
quotation: {
|
||||||
|
include: {
|
||||||
|
customerBranch: {
|
||||||
|
include: {
|
||||||
|
customer: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
productService: {
|
productService: {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue