Commit 3011e0a3f126ede6779593e52716828cc8930dfb
1 parent
d0ba160322
Exists in
master
and in
1 other branch
- Cambié la estructura de la botonera secundaria.
- Unifiqué sector y código. - Invertí el orden de cantidad y precio unitario. - Alineé a la derecha cantidad, precio unitario y subtotal. - Agregué task watch.
Showing
2 changed files
with
32 additions
and
26 deletions
Show diff stats
gulpfile.js
src/views/nota-pedido.html
| ... | ... | @@ -22,13 +22,20 @@ |
| 22 | 22 | </div> |
| 23 | 23 | </div> |
| 24 | 24 | <div class="row p-1 botonera-secundaria"> |
| 25 | - <div class=" col-12 col-sm-6 col-md-3 botonera" ng-repeat="boton in botonera"> | |
| 26 | - <button | |
| 27 | - type="button" | |
| 28 | - class="btn btn-default btn-block btn-xs" | |
| 29 | - ng-bind="boton.texto" | |
| 30 | - ng-click="boton.accion()" | |
| 31 | - ></button> | |
| 25 | + <div class="col-12"> | |
| 26 | + <div class="row"> | |
| 27 | + <div class="col-3 px-0 py-0" ng-repeat="boton in botonera"> | |
| 28 | + <button | |
| 29 | + type="button" | |
| 30 | + class="btn btn-default btn-block btn-xs text-left py-2" | |
| 31 | + ng-click="boton.accion()" | |
| 32 | + > | |
| 33 | + <i class="fa fa-arrow-circle-right"></i> | |
| 34 | + | |
| 35 | + {{boton.texto}} | |
| 36 | + </button> | |
| 37 | + </div> | |
| 38 | + </div> | |
| 32 | 39 | </div> |
| 33 | 40 | </div> |
| 34 | 41 | </div> |
| ... | ... | @@ -40,11 +47,10 @@ |
| 40 | 47 | <table class="table table-striped table-sm table-dark"> |
| 41 | 48 | <thead> |
| 42 | 49 | <tr> |
| 43 | - <th>Sector</th> | |
| 44 | 50 | <th>Código</th> |
| 45 | 51 | <th>Descripción</th> |
| 46 | - <th>Precio Unitario</th> | |
| 47 | 52 | <th>Cantidad</th> |
| 53 | + <th>Precio Unitario</th> | |
| 48 | 54 | <th>SubTotal</th> |
| 49 | 55 | <th> |
| 50 | 56 | <button |
| ... | ... | @@ -71,21 +77,13 @@ |
| 71 | 77 | <tr ng-show="!cargando"> |
| 72 | 78 | <td><input |
| 73 | 79 | class="form-control" |
| 74 | - ng-model="articuloACargar.sector" | |
| 75 | - readonly></td> | |
| 76 | - <td><input | |
| 77 | - class="form-control" | |
| 78 | - ng-model="articuloACargar.codigo" | |
| 80 | + ng-model="articuloACargar.sector + '-' + articuloACargar.codigo" | |
| 79 | 81 | readonly></td> |
| 80 | 82 | <td><input |
| 81 | 83 | class="form-control" |
| 82 | 84 | ng-model="articuloACargar.descripcion" |
| 83 | 85 | readonly></td> |
| 84 | - <td><input | |
| 85 | - class="form-control" | |
| 86 | - ng-value="articuloACargar.precio | currency: '$'" | |
| 87 | - readonly></td> | |
| 88 | - <td><input | |
| 86 | + <td class="text-right"><input | |
| 89 | 87 | class="form-control" |
| 90 | 88 | type="number" |
| 91 | 89 | min="1" |
| ... | ... | @@ -93,7 +91,11 @@ |
| 93 | 91 | foca-focus="!cargando" |
| 94 | 92 | esc-key="resetFilter()" |
| 95 | 93 | ng-keypress="agregarATabla($event.keyCode)"></td> |
| 96 | - <td><input | |
| 94 | + <td class="text-right"><input | |
| 95 | + class="form-control" | |
| 96 | + ng-value="articuloACargar.precio | currency: '$'" | |
| 97 | + readonly></td> | |
| 98 | + <td class="text-right"><input | |
| 97 | 99 | class="form-control" |
| 98 | 100 | ng-value="getSubTotal() | currency: '$'" |
| 99 | 101 | readonly></td> |
| ... | ... | @@ -107,11 +109,9 @@ |
| 107 | 109 | ng-repeat="(key, articulo) in articulosTabla" |
| 108 | 110 | ng-show="show || key == 0" |
| 109 | 111 | > |
| 110 | - <td ng-bind="articulo.sector"></td> | |
| 111 | - <td ng-bind="articulo.codigo"></td> | |
| 112 | + <td ng-bind="articulo.sector + '-' + articulo.codigo"></td> | |
| 112 | 113 | <td ng-bind="articulo.descripcion"></td> |
| 113 | - <td ng-bind="articulo.precio | currency: '$'"></td> | |
| 114 | - <td><input | |
| 114 | + <td class="text-right"><input | |
| 115 | 115 | ng-show="articulo.edit" |
| 116 | 116 | ng-model="articulo.cantidad" |
| 117 | 117 | class="form-control" |
| ... | ... | @@ -128,7 +128,9 @@ |
| 128 | 128 | ng-bind="articulo.cantidad"> |
| 129 | 129 | </i> |
| 130 | 130 | </td> |
| 131 | + <td class="text-right" ng-bind="articulo.precio | currency: '$'"></td> | |
| 131 | 132 | <td |
| 133 | + class="text-right" | |
| 132 | 134 | ng-bind="(articulo.precio * articulo.cantidad) | currency: '$'"> |
| 133 | 135 | </td> |
| 134 | 136 | <td class="text-center"> |
| ... | ... | @@ -141,7 +143,7 @@ |
| 141 | 143 | </td> |
| 142 | 144 | </tr> |
| 143 | 145 | <tr ng-show="cargando"> |
| 144 | - <td colspan="7"> | |
| 146 | + <td colspan="6"> | |
| 145 | 147 | <input |
| 146 | 148 | placeholder="Seleccione Articulo" |
| 147 | 149 | class="form-control form-control-sm" |
| ... | ... | @@ -153,7 +155,7 @@ |
| 153 | 155 | </tbody> |
| 154 | 156 | <tfoot> |
| 155 | 157 | <tr class=""> |
| 156 | - <td colspan="4"> | |
| 158 | + <td colspan="3"> | |
| 157 | 159 | <strong>Cantidad Items:</strong> |
| 158 | 160 | <a ng-bind="articulosTabla.length"></a> |
| 159 | 161 | </td> |