Commit c791734651557ff3882d077b80d4d2e280c0f5a4
1 parent
4cbf2dd18c
Exists in
master
and in
1 other branch
arreglos
Showing
2 changed files
with
9 additions
and
10 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -5,12 +5,11 @@ angular.module('focaHojaRuta') |
| 5 | 5 | hojaRutaService.getHojasRuta().then(function(res) { |
| 6 | 6 | var hojaRuta = res.data.pop(); |
| 7 | 7 | $scope.hojasRuta = hojaRuta; |
| 8 | - $scope.puntoVenta = $scope.rellenar(hojaRuta.sucursal, 4); | |
| 9 | - $scope.comprobante = $scope.rellenar(hojaRuta.numeroHojaRuta, 8); | |
| 8 | + $scope.puntoVenta = hojaRuta.sucursal; | |
| 9 | + $scope.comprobante = hojaRuta.numeroHojaRuta; | |
| 10 | 10 | addCabecera('Transportista:', hojaRuta.transportista[0].nombre); |
| 11 | 11 | addCabecera('Chofer:', hojaRuta.chofer[0].nombre); |
| 12 | 12 | addCabecera('Vehículo:', hojaRuta.vehiculo[0].tractor); |
| 13 | - console.info(hojaRuta.remito); | |
| 14 | 13 | }); |
| 15 | 14 | $scope.cabecera = []; |
| 16 | 15 | $scope.showCabecera = true; |
src/views/lista-hoja-ruta.html
| ... | ... | @@ -6,8 +6,8 @@ |
| 6 | 6 | <div class="col-12 col-sm-4 nota-pedido"> |
| 7 | 7 | <h5>Hojas de ruta</h5> |
| 8 | 8 | </div> |
| 9 | - <div class="col-5 col-sm-4 numero-pedido" | |
| 10 | - >Nº {{puntoVenta}}-{{comprobante}} | |
| 9 | + <div class="col-5 col-sm-4 numero-pedido"> | |
| 10 | + Nº <span ng-bind="[puntoVenta, comprobante] | comprobante"></span> | |
| 11 | 11 | </div> |
| 12 | 12 | <div class="col-7 col-sm-4 text-right"> |
| 13 | 13 | Fecha: |
| ... | ... | @@ -63,13 +63,13 @@ |
| 63 | 63 | <div class="row grilla-articulo"> |
| 64 | 64 | <table class="table tabla-articulo table-striped table-sm table-dark"> |
| 65 | 65 | <thead> |
| 66 | - <tr> | |
| 67 | - <th class="col">#</th> | |
| 66 | + <tr class="d-flex"> | |
| 67 | + <th class="col-auto">#</th> | |
| 68 | 68 | <th class="col">Número</th> |
| 69 | 69 | <th class="col">Razon Social</th> |
| 70 | 70 | <th class="col">Domicilio</th> |
| 71 | - <th class="col">Cantidad</th> | |
| 72 | - <th style="width: 50px"></th> | |
| 71 | + <th class="col text-right">Cantidad</th> | |
| 72 | + <th style="width: 50px"> </th> | |
| 73 | 73 | </tr> |
| 74 | 74 | </thead> |
| 75 | 75 | <tbody class="tabla-articulo-body"> |
| ... | ... | @@ -78,7 +78,7 @@ |
| 78 | 78 | > |
| 79 | 79 | <td ng-bind="key + 1"></td> |
| 80 | 80 | <td |
| 81 | - ng-bind="rellenar(remito.numeroRemito, 4) + '-' + rellenar(remito.numeroRemito, 8)" | |
| 81 | + ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante" | |
| 82 | 82 | ></td> |
| 83 | 83 | <td ng-bind="remito.nombreCliente"></td> |
| 84 | 84 | <td ng-bind="remito.domicilioStamp"></td> |