Commit e69f090b57418d7b8a3e3b6cabdb32f2d78bdb5f
Exists in
master
and in
1 other branch
Merge branch 'develop' into 'master'
Develop See merge request !37
Showing
3 changed files
Show diff stats
package.json
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | "description": "Abm de Vendedores/Compradores", |
| 5 | 5 | "main": "index.html", |
| 6 | 6 | "scripts": { |
| 7 | + "refresh": "gulp uglify && cp tmp/foca-abm-vendedor-cobrador.js ../wrapper-demo/node_modules/foca-abm-vendedor-cobrador/dist/foca-abm-vendedor-cobrador.min.js", | |
| 7 | 8 | "test": "test.html", |
| 8 | 9 | "compile": "gulp uglify", |
| 9 | 10 | "gulp-pre-commit": "gulp pre-commit", |
src/js/controllerItem.js
| ... | ... | @@ -264,7 +264,8 @@ angular.module('focaAbmVendedorCobrador') |
| 264 | 264 | |
| 265 | 265 | var parametros = { |
| 266 | 266 | cuenta: vendedorCobrador, |
| 267 | - tipo: ($scope.vendedorCobrador.rol === 2) ? 'Cobradores' : 'Vendedores' | |
| 267 | + tipo: ($scope.vendedorCobrador.rol === 2) ? 'Cobradores' : 'Vendedores', | |
| 268 | + btnAceptar: true | |
| 268 | 269 | }; |
| 269 | 270 | |
| 270 | 271 | var modalInstance = $uibModal.open( |
src/views/foca-abm-vendedor-cobrador-item.html
| ... | ... | @@ -85,52 +85,56 @@ |
| 85 | 85 | </div> |
| 86 | 86 | <div class="form-group d-flex mb-2 col-md-6"> |
| 87 | 87 | <label class="col-form-label col-md-4">Provincia</label> |
| 88 | - <div class="input-group col-md-8 pl-0"> | |
| 89 | - <input | |
| 90 | - type="text" | |
| 91 | - class="form-control form-control-sm" | |
| 92 | - ng-model="vendedorCobrador.provincia.NOMBRE" | |
| 93 | - ng-keypress="seleccionarProvincia($event.keyCode)" | |
| 94 | - ng-required="true" | |
| 95 | - foca-focus="focused == 4" | |
| 96 | - ng-focus="focused = 4" | |
| 97 | - teclado-virtual | |
| 98 | - /> | |
| 99 | - <div class="input-group-append"> | |
| 100 | - <button | |
| 101 | - ladda="searchLoading" | |
| 102 | - class="btn btn-outline-secondary form-control-sm" | |
| 103 | - type="button" | |
| 104 | - ng-click="seleccionarProvincia(13)" | |
| 105 | - > | |
| 106 | - <i class="fa fa-search" aria-hidden="true"></i> | |
| 107 | - </button> | |
| 88 | + <div class="col-md-8 pl-0"> | |
| 89 | + <div class="input-group"> | |
| 90 | + <input | |
| 91 | + type="text" | |
| 92 | + class="form-control form-control-sm" | |
| 93 | + ng-model="vendedorCobrador.provincia.NOMBRE" | |
| 94 | + ng-keypress="seleccionarProvincia($event.keyCode)" | |
| 95 | + ng-required="true" | |
| 96 | + foca-focus="focused == 4" | |
| 97 | + ng-focus="focused = 4" | |
| 98 | + teclado-virtual | |
| 99 | + /> | |
| 100 | + <div class="input-group-append"> | |
| 101 | + <button | |
| 102 | + ladda="searchLoading" | |
| 103 | + class="btn btn-outline-secondary" | |
| 104 | + type="button" | |
| 105 | + ng-click="seleccionarProvincia(13)" | |
| 106 | + > | |
| 107 | + <i class="fa fa-search" aria-hidden="true"></i> | |
| 108 | + </button> | |
| 109 | + </div> | |
| 108 | 110 | </div> |
| 109 | 111 | </div> |
| 110 | 112 | </div> |
| 111 | 113 | <div class="form-group d-flex mb-2 col-md-6"> |
| 112 | 114 | <label class="col-form-label col-md-4">Localidad</label> |
| 113 | - <div class="input-group col-md-8 pl-0"> | |
| 114 | - <input | |
| 115 | - type="text" | |
| 116 | - class="form-control form-control-sm" | |
| 117 | - ng-model="vendedorCobrador.localidad.NOMBRE" | |
| 118 | - ng-keypress="seleccionarLocalidad($event.keyCode)" | |
| 119 | - ng-required="true" | |
| 120 | - foca-focus="focused == 5" | |
| 121 | - ng-focus="focused = 5" | |
| 122 | - teclado-virtual | |
| 123 | - autocomplete="off" | |
| 124 | - /> | |
| 125 | - <div class="input-group-append"> | |
| 126 | - <button | |
| 127 | - ladda="searchLoading" | |
| 128 | - class="btn btn-outline-secondary form-control-sm" | |
| 129 | - type="button" | |
| 130 | - ng-click="seleccionarLocalidad(13)" | |
| 131 | - > | |
| 132 | - <i class="fa fa-search" aria-hidden="true"></i> | |
| 133 | - </button> | |
| 115 | + <div class="col-md-8 pl-0"> | |
| 116 | + <div class="input-group"> | |
| 117 | + <input | |
| 118 | + type="text" | |
| 119 | + class="form-control form-control-sm" | |
| 120 | + ng-model="vendedorCobrador.localidad.NOMBRE" | |
| 121 | + ng-keypress="seleccionarLocalidad($event.keyCode)" | |
| 122 | + ng-required="true" | |
| 123 | + foca-focus="focused == 5" | |
| 124 | + ng-focus="focused = 5" | |
| 125 | + teclado-virtual | |
| 126 | + autocomplete="off" | |
| 127 | + /> | |
| 128 | + <div class="input-group-append"> | |
| 129 | + <button | |
| 130 | + ladda="searchLoading" | |
| 131 | + class="btn btn-outline-secondary" | |
| 132 | + type="button" | |
| 133 | + ng-click="seleccionarLocalidad(13)" | |
| 134 | + > | |
| 135 | + <i class="fa fa-search" aria-hidden="true"></i> | |
| 136 | + </button> | |
| 137 | + </div> | |
| 134 | 138 | </div> |
| 135 | 139 | </div> |
| 136 | 140 | </div> |