Commit f5123882bfe9cc06efb15054129ad1d4396f328f
1 parent
c7268e6fb0
Exists in
master
reacomodo tabla, a cargar disponible en función,
rellenar botonera facturador 4
Showing
2 changed files
with
29 additions
and
19 deletions
Show diff stats
src/views/foca-detalle-vehiculo.html
| 1 | 1 | <div class="modal-header"> |
| 2 | 2 | <h4>Detalle de carga</h4> |
| 3 | - Transportista <strong ng-bind="vehiculo.transportista.NOM"></strong> | |
| 3 | + Transportista | |
| 4 | + <strong ng-bind="vehiculo.transportista.COD"></strong> | |
| 5 | + <strong ng-bind="vehiculo.transportista.NOM"></strong> | |
| 4 | 6 | Unidad <strong ng-bind="vehiculo.codigo"></strong> |
| 5 | 7 | Tractor <strong ng-bind="vehiculo.tractor"></strong> |
| 6 | 8 | <br> |
| ... | ... | @@ -22,9 +24,9 @@ |
| 22 | 24 | <tr> |
| 23 | 25 | <th></th> |
| 24 | 26 | <th>Articulo</th> |
| 25 | - <th>Total</th> | |
| 27 | + <th>Cantidad</th> | |
| 26 | 28 | <th>Cargado</th> |
| 27 | - <th>Pendiente</th> | |
| 29 | + <th>Resta asignar</th> | |
| 28 | 30 | </tr> |
| 29 | 31 | </thead> |
| 30 | 32 | <tbody> |
| ... | ... | @@ -44,34 +46,44 @@ |
| 44 | 46 | </tr> |
| 45 | 47 | </tbody> |
| 46 | 48 | </table> |
| 47 | - <table class="table table-sm"> | |
| 49 | + <table class="table table-sm" ladda="cargandoDatos" data-spinner-color="#FF0000"> | |
| 48 | 50 | <thead> |
| 49 | 51 | <tr> |
| 50 | 52 | <th width="10%">Cisterna</th> |
| 51 | - <th width="20%">Cantidad asignada</th> | |
| 52 | - <th width="35%">Estado</th> | |
| 53 | + <th>Capacidad</th> | |
| 53 | 54 | <th>Articulo cargado</th> |
| 55 | + <th width="20%">Asignado</th> | |
| 56 | + <th>Cargado / Capacidad Disponible</th> | |
| 54 | 57 | </tr> |
| 55 | 58 | </thead> |
| 56 | 59 | <tbody> |
| 57 | 60 | <tr ng-repeat="(key, cisterna) in vehiculo.cisternas"> |
| 58 | - <td ng-bind="cisterna.codigo"></td> | |
| 59 | - <td><input | |
| 61 | + <td class="py-3" ng-bind="cisterna.codigo"></td> | |
| 62 | + <td class="py-3" ng-bind="cisterna.capacidad"></td> | |
| 63 | + <td class="py-3" ng-bind="cisterna.cisternaCarga.articulo.DetArt || 'Sin asignar'"></td> | |
| 64 | + <td ng-if="idRemito != -1"> | |
| 65 | + <input | |
| 60 | 66 | class="form-control" |
| 61 | 67 | foca-tipo-input |
| 62 | 68 | foca-teclado |
| 63 | 69 | placeholder="A cargar..." |
| 64 | 70 | ng-model="aCargar[key]" |
| 65 | - ng-disabled="(articuloSeleccionado.idArticulo !== cisterna.cisternaCarga.idProducto && | |
| 66 | - cisterna.cisternaCarga.idProducto) || !tieneArticulosPendientes() | |
| 67 | - || articuloSeleccionado.cantidad > cisterna.disponible" | |
| 71 | + ng-disabled="cisterna.disabled" | |
| 72 | + ng-focus="aCargar[key] = rellenarInput(aCargar[key]); actualizarArticulo()" | |
| 68 | 73 | ng-change="actualizarArticulo()" |
| 69 | 74 | > |
| 70 | 75 | </td> |
| 76 | + <td ng-if="idRemito == -1"> | |
| 77 | + <input | |
| 78 | + class="form-control" | |
| 79 | + placeholder="A cargar..." | |
| 80 | + readonly> | |
| 81 | + </td> | |
| 71 | 82 | <td><div class="progress foca-alto-progress pl-0 pr-0 mt-1"> |
| 72 | 83 | <strong |
| 73 | 84 | class="mt-2 col-4 text-center position-absolute" |
| 74 | - ng-bind="(cisterna.cisternaCarga.cantidad || 0) + '/' + (cisterna.capacidad)"> | |
| 85 | + ng-bind="(cisterna.cisternaCarga.cantidad || 0) + '/' + | |
| 86 | + (cisterna.capacidad - cisterna.cisternaCarga.cantidad)"> | |
| 75 | 87 | </strong> |
| 76 | 88 | <div |
| 77 | 89 | id="{{cisterna.id}}" |
| ... | ... | @@ -83,7 +95,6 @@ |
| 83 | 95 | </div> |
| 84 | 96 | </div> |
| 85 | 97 | </td> |
| 86 | - <td ng-bind="cisterna.cisternaCarga.articulo.DetArt || 'Sin asignar'"></td> | |
| 87 | 98 | </tr> |
| 88 | 99 | </tbody> |
| 89 | 100 | </table> |
| ... | ... | @@ -93,11 +104,10 @@ |
| 93 | 104 | ladda="cargando" |
| 94 | 105 | data-spinner-color="#FF0000" |
| 95 | 106 | type="button" |
| 96 | - ng-disabled="!articuloSeleccionado || articuloSeleccionado.cantidad - | |
| 97 | - articuloSeleccionado.cantidadCargada !== 0 || !tieneArticulosPendientes()" | |
| 98 | - ng-class="{'btn-light': !articuloSeleccionado || articuloSeleccionado.cantidad - | |
| 99 | - articuloSeleccionado.cantidadCargada !== 0 || !tieneArticulosPendientes()}" | |
| 100 | - ng-click="cargarACisternas(vehiculo)"> | |
| 107 | + ng-disabled="!distribucionDisponible()" | |
| 108 | + ng-class="{'btn-light': !distribucionDisponible()}" | |
| 109 | + ng-click="cargarACisternas(vehiculo)" | |
| 110 | + foca-focus="distribucionDisponible()"> | |
| 101 | 111 | Aplicar distribución de cargas |
| 102 | 112 | </button> |
| 103 | 113 | </div> |
src/views/foca-logistica-pedido-ruta.html
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | </div> |
| 9 | 9 | <div class="row px-5 py-2 botonera-secundaria"> |
| 10 | 10 | <div class="col-12"> |
| 11 | - <foca-botonera-facturador botones="botonera" extra="5" class="row"></foca-botonera-facturador> | |
| 11 | + <foca-botonera-facturador botones="botonera" extra="4" class="row"></foca-botonera-facturador> | |
| 12 | 12 | </div> |
| 13 | 13 | </div> |
| 14 | 14 | <div class="row"> |