added claim list #443
This commit is contained in:
parent
72766d0759
commit
a06f7fb01f
|
|
@ -1,9 +1,9 @@
|
||||||
<vn-crud-model
|
<vn-crud-model
|
||||||
vn-id="model"
|
vn-id="model"
|
||||||
url="/ticket/api/Tickets"
|
url="/claim/api/Claims"
|
||||||
filter="::$ctrl.filter"
|
filter="::$ctrl.filter"
|
||||||
limit="20"
|
limit="20"
|
||||||
data="tickets"
|
data="claims"
|
||||||
auto-load="false">
|
auto-load="false">
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
<div margin-medium>
|
<div margin-medium>
|
||||||
|
|
@ -17,64 +17,43 @@
|
||||||
</vn-card>
|
</vn-card>
|
||||||
</div>
|
</div>
|
||||||
<vn-card margin-medium-v pad-medium>
|
<vn-card margin-medium-v pad-medium>
|
||||||
<table class="vn-grid">
|
<vn-table model="model">
|
||||||
<thead>
|
<vn-thead>
|
||||||
<tr>
|
<vn-tr>
|
||||||
<th translate number>Id</th>
|
<vn-th field="id" number>Id</vn-th>
|
||||||
<th translate>Salesperson</th>
|
<vn-th field="clientFk" number>Client Id</vn-th>
|
||||||
<th translate>Date</th>
|
<vn-th field="clientFk">Client</vn-th>
|
||||||
<th translate>Hour</th>
|
<vn-th field="created">Created</vn-th>
|
||||||
<th translate>Alias</th>
|
<vn-th field="workerFk">Worker</vn-th>
|
||||||
<th translate>Province</th>
|
<vn-th field="observation">Observation</vn-th>
|
||||||
<th translate>State</th>
|
<vn-th field="claimResponsibleFk">Responsible</vn-th>
|
||||||
<th translate>Agency</th>
|
<vn-th field="claimStateFk">State</vn-th>
|
||||||
<th translate>Warehouse</th>
|
<vn-th></vn-th>
|
||||||
<th translate number>Invoice</th>
|
</vn-tr>
|
||||||
<th translate number>Route</th>
|
</vn-thead>
|
||||||
<th></th>
|
<vn-tbody>
|
||||||
</tr>
|
<vn-tr ng-repeat="claim in claims">
|
||||||
</thead>
|
<vn-td number>{{::claim.id}}</vn-td>
|
||||||
<tbody>
|
<vn-td number>{{::claim.client.id}}</vn-td>
|
||||||
<tr ng-repeat="ticket in tickets"
|
<vn-td>{{::claim.client.name}}</vn-td>
|
||||||
class="{{::$ctrl.compareDate(ticket.shipped)}} clickable"
|
<vn-td>{{::claim.created | date:'dd/MM/yyyy'}}</vn-td>
|
||||||
ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
|
<vn-td>{{::claim.worker.firstName}} {{::claim.worker.name}}</vn-td>
|
||||||
<th number>{{::ticket.id}}</th>
|
<vn-td>{{::claim.observation}}</vn-td>
|
||||||
<td>{{::ticket.client.salesPerson.name | dashIfEmpty}}</td>
|
<vn-td>{{::claim.claimResponsible.description}}</vn-td>
|
||||||
<td>{{::ticket.shipped | date:'dd/MM/yyyy'}}</td>
|
<vn-td>{{::claim.claimState.description}}</vn-td>
|
||||||
<td>{{::ticket.shipped | date:'HH:mm'}}</td>
|
<vn-td>
|
||||||
<td>
|
|
||||||
<span
|
|
||||||
class="link"
|
|
||||||
ng-click="$ctrl.showDescriptor($event, ticket.clientFk)">
|
|
||||||
{{::ticket.nickname}}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td>{{::ticket.address.province.name}}</td>
|
|
||||||
<td>{{::ticket.tracking.state.name}}</td>
|
|
||||||
<td>{{::ticket.agencyMode.name}}</td>
|
|
||||||
<td>{{::ticket.warehouse.name}}</td>
|
|
||||||
<td number>{{::ticket.refFk | dashIfEmpty}}</td>
|
|
||||||
<td number>{{::ticket.routeFk | dashIfEmpty}}</td>
|
|
||||||
<td>
|
|
||||||
<vn-icon-button
|
<vn-icon-button
|
||||||
ng-click="$ctrl.preview($event, ticket)"
|
ng-click="$ctrl.preview($event, ticket)"
|
||||||
vn-tooltip="Preview"
|
vn-tooltip="Preview"
|
||||||
icon="desktop_windows">
|
icon="desktop_windows">
|
||||||
</vn-icon-button>
|
</vn-icon-button>
|
||||||
</td>
|
</vn-td>
|
||||||
</tr>
|
</vn-tr>
|
||||||
</tbody>
|
</vn-tbody>
|
||||||
</table>
|
</vn-table>
|
||||||
<vn-client-descriptor-popover vn-id="descriptor"></vn-client-descriptor-popover>
|
|
||||||
</vn-card>
|
</vn-card>
|
||||||
<vn-pagination
|
<vn-pagination
|
||||||
model="model"
|
model="model"
|
||||||
scroll-selector="ui-view">
|
scroll-selector="ui-view">
|
||||||
</vn-pagination>
|
</vn-pagination>
|
||||||
</div>
|
</div>
|
||||||
<vn-dialog class="dialog-summary"
|
|
||||||
vn-id="dialog-summary-ticket">
|
|
||||||
<tpl-body>
|
|
||||||
<vn-ticket-summary ticket="$ctrl.ticketSelected"></vn-ticket-summary>
|
|
||||||
</tpl-body>
|
|
||||||
</vn-dialog>
|
|
||||||
|
|
@ -8,51 +8,31 @@ export default class Controller {
|
||||||
this.filter = {
|
this.filter = {
|
||||||
include: [
|
include: [
|
||||||
{
|
{
|
||||||
relation: 'address',
|
|
||||||
scope: {
|
|
||||||
fields: ['provinceFk'],
|
|
||||||
include: {
|
|
||||||
relation: 'province',
|
|
||||||
scope: {
|
|
||||||
fields: ['name']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
relation: 'warehouse',
|
|
||||||
scope: {
|
|
||||||
fields: ['name']
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
relation: 'agencyMode',
|
|
||||||
scope: {
|
|
||||||
fields: ['name']
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
relation: 'tracking',
|
|
||||||
scope: {
|
|
||||||
fields: ['stateFk'],
|
|
||||||
include: {
|
|
||||||
relation: 'state',
|
|
||||||
scope: {
|
|
||||||
fields: ['name']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
relation: 'client',
|
relation: 'client',
|
||||||
scope: {
|
scope: {
|
||||||
fields: ['salesPersonFk'],
|
fields: ['name']
|
||||||
include: {
|
}
|
||||||
relation: 'salesPerson',
|
},
|
||||||
scope: {
|
{
|
||||||
fields: ['name']
|
relation: 'worker',
|
||||||
}
|
scope: {
|
||||||
}
|
fields: ['firstName', 'name']
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
relation: 'claimResponsible',
|
||||||
|
scope: {
|
||||||
|
fields: ['description']
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
relation: 'claimState',
|
||||||
|
scope: {
|
||||||
|
fields: ['description']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
order: 'shipped DESC'
|
order: 'claimStateFk ASC, created DESC'
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
#Ordenar alfabeticamente
|
#Ordenar alfabeticamente
|
||||||
|
Client Id: Id cliente
|
||||||
|
Observation: Observación
|
||||||
|
Responsible: Responsable
|
||||||
|
|
||||||
#sections
|
#sections
|
||||||
Claims: Reclamaciones
|
Claims: Reclamaciones
|
||||||
|
|
|
||||||
|
|
@ -8,4 +8,4 @@ salix: []
|
||||||
#route: []
|
#route: []
|
||||||
ticket: [item, client]
|
ticket: [item, client]
|
||||||
order: [item, ticket]
|
order: [item, ticket]
|
||||||
claim: []
|
claim: [item, client]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue