Luis Suarez / foca-modal-detalle-hoja-ruta

Download as
Browse Code »

Commit d04651618350308efa0fdb5bc127b7b7187a1542

Authored by Eric
1 parent 92bf19da44
Exists in master and in 2 other branches develop, lab

rechazar mssg

Showing 2 changed files with 12 additions and 1 deletions   Show diff stats
src/js/controller.js
Diff comments   View file @ d046516
... ... @@ -19,6 +19,11 @@ angular.module('focaModalDetalleHojaRuta')
19 19 $scope.aDescargar = [];
20 20 $scope.cargando = false;
21 21  
  22 + if ($scope.remito.rechazado) {
  23 +
  24 + $scope.readonly = true;
  25 + }
  26 +
22 27 //Datos
23 28 // var promesaRemito = focaModalDetalleHojaRutaService
24 29 // .getRemitoById(idRemito);
... ... @@ -207,10 +212,12 @@ angular.module('focaModalDetalleHojaRuta')
207 212 var remitoRechazado = $.extend(true, {}, $scope.remito);
208 213 delete remitoRechazado.articulosRemito;
209 214 delete remitoRechazado.notaPedido;
  215 + delete remitoRechazado.cisternas;
210 216 remitoRechazado.rechazado = true;
211 217 remitoRechazado.motivoRechazo = motivo;
212 218 remitoRechazado.fechaRemito =
213 219 remitoRechazado.fechaRemito.slice(0, 19).replace('T', ' ');
  220 +
214 221 focaModalDetalleHojaRutaService.rechazarRemito(remitoRechazado)
215 222 .then(function(res) {
216 223 focaSeguimientoService.guardarPosicion(
src/views/modal-detalle-hoja-ruta.html
Diff comments   View file @ d046516
... ... @@ -22,7 +22,7 @@
22 22 <div class="col-12">
23 23 <label class="form-control-sm">
24 24 <b>Remito Nº</b>
25   - <span ng-bind="[remito.numeroRemito, remito.sucursal] | comprobante"/>
  25 + <span ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"/>
26 26 </label>
27 27 </div>
28 28 <div class="col-12">
... ... @@ -138,6 +138,10 @@
138 138 Descargar
139 139 </button>
140 140 </div>
  141 +
  142 + <label
  143 + class="col-12 bg-danger text-white" ng-show="remito.rechazado"
  144 + >Remito rechazado</label>
141 145 </form>
142 146 </div>
143 147 <div class="modal-footer py-2">