Commit b7ba24419696051230c7785d0423326c2b1f09da
1 parent
531a6bf748
Exists in
master
vista
Showing
1 changed file
with
135 additions
and
104 deletions
Show diff stats
src/views/modal-detalle-hoja-ruta.html
1 | 1 | <div class="modal-header py-1"> |
2 | 2 | <h5 class="modal-title">Detalle de descarga</h5> |
3 | 3 | </div> |
4 | -<div class="modal-body" id="modal-body"> | |
4 | +<div class="modal-body" id="modal-body" ladda="cargando" data-spinner-color="#FF0000" data-spinner-size="5"> | |
5 | 5 | <form name="formDetalleHojaRuta"> |
6 | - <div class="form-group row"> | |
6 | + <div class="form-group row" ng-show="!cargando"> | |
7 | 7 | <div class="col-12 px-0"> |
8 | - <label class="form-control-sm"> | |
9 | - <b>Remito Nº</b> | |
10 | - <span ng-bind="[remito.numeroRemito, remito.sucursal] | comprobante"/> | |
11 | - </label> | |
12 | - </div> | |
13 | - <div class="col-12 px-0"> | |
14 | - <label class="form-control-sm"> | |
15 | - <b>Cliente</b> | |
16 | - </label> | |
17 | - <span ng-bind="remito.nombreCliente"/> | |
18 | - </div> | |
19 | - <div class="col-12 px-0"> | |
20 | - <label class="form-control-sm"> | |
21 | - <b>Domicilio</b> | |
22 | - <span ng-bind="remito.domicilioStamp"/> | |
23 | - </label> | |
24 | - </div> | |
25 | - <div class="col-12 px-0"> | |
26 | - <strong>Articulo a descargar</strong> | |
27 | - <table class="table table-sm"> | |
28 | - <thead> | |
29 | - <tr> | |
30 | - <th></th> | |
31 | - <th>Articulo</th> | |
32 | - <th>Total</th> | |
33 | - <th>Descargado</th> | |
34 | - </tr> | |
35 | - </thead> | |
36 | - <tbody> | |
37 | - <tr ng-repeat="(key, articulo) in remito.articulosRemito"> | |
38 | - <td class="pt-2"><input | |
39 | - type="radio" | |
40 | - name="articuloRadio" | |
41 | - id="{{'articulo' + articulo.id}}" | |
42 | - ng-click="cambio(articulo)" | |
43 | - ng-disabled="articulo.cargado" | |
44 | - ></td> | |
45 | - <td ng-bind="articulo.descripcion"></td> | |
46 | - <td ng-bind="articulo.cantidad"></td> | |
47 | - <td ng-bind="articulo.descargado || articulo.cantidad"></td> | |
48 | - </tbody> | |
49 | - </table> | |
50 | - <strong>Cisterna</strong> | |
51 | - <table class="table table-sm"> | |
52 | - <thead> | |
53 | - <tr> | |
54 | - <th>Código</th> | |
55 | - <th>Articulo</th> | |
56 | - <th>Total</th> | |
57 | - <th>A descargar</th> | |
58 | - </tr> | |
59 | - </thead> | |
60 | - <tbody> | |
61 | - <tr ng-repeat="(key, cisterna) in cisternas"> | |
62 | - <td ng-bind="cisterna.codigo"></td> | |
63 | - <td ng-bind="cisterna.cisternaCarga.articulo.DetArt"></td> | |
64 | - <td ng-bind="cisterna.cisternaCarga.cantidad"></td> | |
65 | - <td><input | |
66 | - class="form-control form-control-sm" | |
67 | - type="number" | |
68 | - ng-model="cisterna.aDescargar" | |
69 | - foca-focus="" | |
70 | - ng-disabled="articuloSeleccionado.idArticulo != cisterna.cisternaCarga.idProducto"/></td> | |
71 | - </tr> | |
72 | - </tbody> | |
73 | - </table> | |
74 | - </div> | |
75 | - <div class="col-12 px-0"> | |
76 | - <label class="form-control-sm px-0"> | |
77 | - <b>Observaciones</b> | |
78 | - </label> | |
79 | - </div> | |
80 | - <div class="col-12"> | |
81 | - <textarea | |
82 | - ng-model="remito.observaciones" | |
83 | - class="form-control form-control-sm" | |
84 | - rows="1" | |
85 | - ></textarea> | |
86 | - </div> | |
87 | - <div class="col-12 row mt-2"> | |
88 | - <label class="form-control-sm px-0 col-3"><b>Nº Recibo</b></label> | |
89 | - <input | |
90 | - class="form-control form-control-sm col-4" | |
91 | - type="number" | |
92 | - ng-model="numeroRecibo"> | |
8 | + <strong>Información Remito</strong> | |
93 | 9 | <button |
94 | - class="ml-4 form-control-sm btn btn-success col-4" | |
95 | - ladda="cargando" | |
96 | - data-spinner-color="#FF0000" | |
97 | - type="button" | |
98 | - ng-disabled="!distribucionDisponible()" | |
99 | - ng-click="cargarACisternas(vehiculo)" | |
100 | - foca-focus="distribucionDisponible()"> | |
101 | - Descargar | |
10 | + class="btn btn-sm btn-outline-light selectable" | |
11 | + ng-click="verInformacion = !verInformacion" | |
12 | + ><i | |
13 | + class="fa fa-chevron-down" | |
14 | + ng-show="verInformacion"></i> | |
15 | + <i | |
16 | + class="fa fa-chevron-up" | |
17 | + ng-hide="verInformacion"> | |
18 | + </i> | |
102 | 19 | </button> |
103 | 20 | </div> |
21 | + <div class="row" ng-show="verInformacion"> | |
22 | + <div class="col-12"> | |
23 | + <label class="form-control-sm"> | |
24 | + <b>Remito Nº</b> | |
25 | + <span ng-bind="[remito.numeroRemito, remito.sucursal] | comprobante"/> | |
26 | + </label> | |
27 | + </div> | |
28 | + <div class="col-12"> | |
29 | + <label class="form-control-sm"> | |
30 | + <b>Cliente</b> | |
31 | + </label> | |
32 | + <span ng-bind="remito.nombreCliente"/> | |
33 | + </div> | |
34 | + <div class="col-12"> | |
35 | + <label class="form-control-sm"> | |
36 | + <b>Domicilio</b> | |
37 | + <span ng-bind="remito.domicilioStamp"/> | |
38 | + </label> | |
39 | + </div> | |
40 | + <div ng-show="remito.notaPedido.notaPedidoPuntoDescarga.length" class="px-3"> | |
41 | + <label class="form-control-sm"> | |
42 | + <b>Puntos de descarga</b> | |
43 | + </label> | |
44 | + <table class="table table-sm"> | |
45 | + <thead> | |
46 | + <tr> | |
47 | + <th>Nombre</th> | |
48 | + <th>Articulo</th> | |
49 | + <th>Cantidad</th> | |
50 | + </tr> | |
51 | + </thead> | |
52 | + <tbody> | |
53 | + <tr ng-repeat="(key, puntoDescarga) in remito.notaPedido.notaPedidoPuntoDescarga"> | |
54 | + <td ng-bind="puntoDescarga.puntoDescarga.descripcion"></td> | |
55 | + <td ng-bind="puntoDescarga.producto.DetArt"></td> | |
56 | + <td ng-bind="puntoDescarga.cantidad"></td> | |
57 | + </tbody> | |
58 | + </table> | |
59 | + </div> | |
60 | + </div> | |
61 | + <strong>Articulo a descargar</strong> | |
62 | + <table class="table table-sm"> | |
63 | + <thead> | |
64 | + <tr> | |
65 | + <th></th> | |
66 | + <th>Articulo</th> | |
67 | + <th>Total</th> | |
68 | + <th>Descargado</th> | |
69 | + </tr> | |
70 | + </thead> | |
71 | + <tbody> | |
72 | + <tr ng-repeat="(key, articulo) in remito.articulosRemito"> | |
73 | + <td class="pt-2"> | |
74 | + <input | |
75 | + type="radio" | |
76 | + name="articuloRadio" | |
77 | + id="{{'articulo' + articulo.id}}" | |
78 | + ng-click="cambio(articulo)" | |
79 | + ng-disabled="articulo.cargado" | |
80 | + ng-checked="articuloSeleccionado.id === articulo.id" | |
81 | + ></td> | |
82 | + <td ng-bind="articulo.descripcion"></td> | |
83 | + <td ng-bind="articulo.cantidad"></td> | |
84 | + <td ng-bind="articulo.cantidad - articulo.cantidadDescargada"></td> | |
85 | + </tbody> | |
86 | + </table> | |
87 | + <strong>Cisterna</strong> | |
88 | + <table class="table table-sm"> | |
89 | + <thead> | |
90 | + <tr> | |
91 | + <th>Código</th> | |
92 | + <th>Articulo</th> | |
93 | + <th>Total</th> | |
94 | + <th>A descargar</th> | |
95 | + </tr> | |
96 | + </thead> | |
97 | + <tbody> | |
98 | + <tr ng-repeat="(key, cisterna) in cisternas"> | |
99 | + <td ng-bind="cisterna.codigo"></td> | |
100 | + <td ng-bind="cisterna.cisternaCarga.articulo.DetArt"></td> | |
101 | + <td ng-bind="cisterna.cisternaCarga.cantidad"></td> | |
102 | + <td><input | |
103 | + class="form-control form-control-sm" | |
104 | + type="number" | |
105 | + ng-model="aDescargar[key]" | |
106 | + ng-change="actualizarArticulo()" | |
107 | + foca-focus="articuloSeleccionado.idArticulo == cisterna.cisternaCarga.idProducto" | |
108 | + ng-disabled="articuloSeleccionado.idArticulo != cisterna.cisternaCarga.idProducto"/></td> | |
109 | + </tr> | |
110 | + </tbody> | |
111 | + </table> | |
112 | + <div class="col-12 px-0"> | |
113 | + <label class="form-control-sm px-0"> | |
114 | + <b>Observaciones</b> | |
115 | + </label> | |
116 | + </div> | |
117 | + <div class="col-12"> | |
118 | + <textarea | |
119 | + ng-model="remito.observaciones" | |
120 | + class="form-control form-control-sm" | |
121 | + rows="1" | |
122 | + ></textarea> | |
123 | + </div> | |
124 | + <div class="col-12 row mt-2"> | |
125 | + <label class="form-control-sm px-0 col-3"><b>Nº Recibo</b></label> | |
126 | + <input | |
127 | + class="form-control form-control-sm col-4" | |
128 | + type="number" | |
129 | + ng-model="numeroRecibo" | |
130 | + ng-keypress="descargar($event.keyCode)" | |
131 | + foca-focus="distribucionDisponible()"> | |
132 | + <button | |
133 | + class="ml-4 form-control-sm btn btn-success col-4" | |
134 | + ladda="cargando" | |
135 | + data-spinner-color="#FF0000" | |
136 | + type="button" | |
137 | + ng-disabled="!distribucionDisponible() || !numeroRecibo" | |
138 | + ng-click="descargar(13)"> | |
139 | + Descargar | |
140 | + </button> | |
104 | 141 | </div> |
105 | 142 | </form> |
106 | 143 | </div> |
... | ... | @@ -108,18 +145,12 @@ |
108 | 145 | <button |
109 | 146 | class="btn btn-danger btn-sm" |
110 | 147 | type="button" |
111 | - ng-click="" | |
148 | + ng-click="rechazar()" | |
112 | 149 | ng-disabled="" |
113 | - >Anular</button> | |
150 | + >Rechazar</button> | |
114 | 151 | <button |
115 | 152 | class="btn btn-secondary btn-sm" |
116 | 153 | type="button" |
117 | 154 | ng-click="cancel()" |
118 | - >Cancelar</button> | |
119 | - <button | |
120 | - class="btn btn-primary btn-sm" | |
121 | - type="button" | |
122 | - ng-click="aceptar()" | |
123 | - ng-disabled="validar()" | |
124 | - >Aceptar</button> | |
155 | + >Salir</button> | |
125 | 156 | </div> |