7199-devToTest_2316 #2287
|
@ -1,3 +1,13 @@
|
|||
td{
|
||||
overflow: hidden;
|
||||
max-width: 100px;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
/* .text-field{
|
||||
text-overflow: ellipsis;
|
||||
} */
|
||||
|
||||
h1 {
|
||||
text-align: center;
|
||||
}
|
||||
|
|
|
@ -103,7 +103,7 @@
|
|||
<table width="100%">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th class="font gray align-right">{{$t('street')}}</th>
|
||||
<th class="text-field font gray align-right">{{$t('street')}}</th>
|
||||
<td>{{ticket.street}}</td>
|
||||
<th class="font gray align-right">{{$t('postcode')}}</th>
|
||||
<td>{{ticket.postalCode}}</td>
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
SELECT
|
||||
r.id,
|
||||
SELECT r.id,
|
||||
r.m3,
|
||||
r.created,
|
||||
r.time,
|
||||
|
@ -7,8 +6,8 @@ SELECT
|
|||
v.tradeMark vehicleTradeMark,
|
||||
v.model vehicleModel,
|
||||
v.numberPlate plateNumber,
|
||||
IFNULL(s.name, am.name) AS agencyName
|
||||
FROM route r
|
||||
IFNULL(s.name, am.name) 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.id
|
||||
|
@ -16,4 +15,4 @@ FROM route r
|
|||
LEFT JOIN agency a ON a.id = am.agencyFk
|
||||
LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id
|
||||
LEFT JOIN supplier s ON s.id = sa.supplierFk
|
||||
WHERE r.id IN(?)
|
||||
WHERE r.id IN(?)
|
||||
|
|
|
@ -1,25 +1,24 @@
|
|||
SELECT
|
||||
t.nickname addressName,
|
||||
SELECT t.nickname addressName,
|
||||
t.packages,
|
||||
t.priority,
|
||||
t.id,
|
||||
t.clientFk,
|
||||
t.companyFk,
|
||||
t.routeFk,
|
||||
if(a.phone, a.phone, c.phone) AS phone,
|
||||
if(a.mobile, a.mobile, c.mobile) AS mobile,
|
||||
if(a.phone, a.phone, c.phone) phone,
|
||||
if(a.mobile, a.mobile, c.mobile) mobile,
|
||||
wh.name warehouseName,
|
||||
a.city,
|
||||
a.street,
|
||||
a.postalCode,
|
||||
LPAD(a.id, 5, '0') AS addressFk,
|
||||
LPAD(a.id, 5, '0') addressFk,
|
||||
p.name province,
|
||||
0 AS import,
|
||||
0 import,
|
||||
am.name ticketAgency,
|
||||
tob.description,
|
||||
u.nickName salesPersonName,
|
||||
ipkg.itemPackingTypes
|
||||
FROM route r
|
||||
FROM route r
|
||||
JOIN ticket t ON t.routeFk = r.id
|
||||
LEFT JOIN address a ON a.id = t.addressFk
|
||||
LEFT JOIN client c ON c.id = t.clientFk
|
||||
|
@ -39,5 +38,5 @@ FROM route r
|
|||
WHERE r.id IN (?)
|
||||
GROUP BY t.id
|
||||
) ipkg ON ipkg.ticketFk = t.id
|
||||
WHERE r.id IN (?)
|
||||
ORDER BY t.priority, t.id;
|
||||
WHERE r.id IN (?)
|
||||
ORDER BY t.priority, t.id;
|
Loading…
Reference in New Issue