2908-logs_no_ellipsize #625
|
@ -2,7 +2,7 @@
|
|||
|
||||
vn-monitor-sales-orders {
|
||||
vn-table.scrollable {
|
||||
height: 350px
|
||||
max-height: 350px
|
||||
}
|
||||
|
||||
vn-table a.vn-tbody {
|
||||
|
|
|
@ -7,10 +7,12 @@ SELECT
|
|||
v.tradeMark vehicleTradeMark,
|
||||
v.model vehicleModel,
|
||||
v.numberPlate plateNumber,
|
||||
am.name agencyName
|
||||
IFNULL(s.name, am.name) AS agencyName
|
||||
FROM route r
|
||||
LEFT JOIN vehicle v ON v.id = r.vehicleFk
|
||||
LEFT JOIN worker w ON w.id = r.workerFk
|
||||
LEFT JOIN account.user u ON u.id = w.userFk
|
||||
LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
|
||||
LEFT JOIN agency a ON a.id = am.agencyFk
|
||||
LEFT JOIN supplier s ON s.id = a.supplierFk
|
||||
WHERE r.id IN(?)
|
Loading…
Reference in New Issue