Commit 0aef527f324226860d1c21acfb5f89c7ce3d222c
1 parent
7319717d4a
Exists in
master
vendedor y cobrador
Showing
2 changed files
with
34 additions
and
5 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -147,6 +147,7 @@ angular.module('focaAbmVendedorCobrador') |
| 147 | 147 | DNI: ' ', |
| 148 | 148 | ClaVen: '', |
| 149 | 149 | ComVen: '0.00', |
| 150 | + comisionCobrador: '0.00', | |
| 150 | 151 | provincia: { |
| 151 | 152 | NOMBRE: '' |
| 152 | 153 | }, |
| ... | ... | @@ -157,11 +158,15 @@ angular.module('focaAbmVendedorCobrador') |
| 157 | 158 | $scope.options = [ |
| 158 | 159 | { |
| 159 | 160 | label: 'Vendedor', |
| 160 | - value: null | |
| 161 | + value: 1 | |
| 161 | 162 | }, |
| 162 | 163 | { |
| 163 | 164 | label: 'Cobrador', |
| 164 | - value: true | |
| 165 | + value: 2 | |
| 166 | + }, | |
| 167 | + { | |
| 168 | + label: 'Vendedor y cobrador', | |
| 169 | + value: 3 | |
| 165 | 170 | } |
| 166 | 171 | ]; |
| 167 | 172 | //SETEO BOTONERA LATERAL |
| ... | ... | @@ -194,6 +199,11 @@ angular.module('focaAbmVendedorCobrador') |
| 194 | 199 | delete $scope.vendedorCobrador.provincia; |
| 195 | 200 | delete $scope.vendedorCobrador.localidad; |
| 196 | 201 | delete $scope.vendedorCobrador.ClaVen2; |
| 202 | + if($scope.vendedorCobrador.rol == 1) { | |
| 203 | + delete $scope.vendedorCobrador.comisionCobrador; | |
| 204 | + }else if($scope.vendedorCobrador.rol == 2) { | |
| 205 | + delete $scope.vendedorCobrador.ComVen; | |
| 206 | + } | |
| 197 | 207 | |
| 198 | 208 | focaAbmVendedorCobradorService |
| 199 | 209 | .guardarVendedorCobrador($scope.vendedorCobrador) |
src/views/foca-abm-vendedor-cobrador-item.html
| ... | ... | @@ -14,7 +14,7 @@ |
| 14 | 14 | <div class="col-md-8 pl-0"> |
| 15 | 15 | <select |
| 16 | 16 | class="form-control form-control-sm" |
| 17 | - ng-model="vendedorCobrador.ES_COBRADOR" | |
| 17 | + ng-model="vendedorCobrador.rol" | |
| 18 | 18 | ng-options="option.value as option.label for option in options" |
| 19 | 19 | foca-focus="focused == 0" |
| 20 | 20 | ng-focus="focused = 0"> |
| ... | ... | @@ -188,8 +188,9 @@ |
| 188 | 188 | /> |
| 189 | 189 | </div> |
| 190 | 190 | </div> |
| 191 | - <div class="form-group d-flex mb-2 col-md-6"> | |
| 192 | - <label class="col-form-label col-md-4">Porcentaje de comisión</label> | |
| 191 | + <div class="form-group d-flex mb-2 col-md-6" | |
| 192 | + ng-show="vendedorCobrador.rol == 1 || vendedorCobrador.rol == 3"> | |
| 193 | + <label class="col-form-label col-md-4">Porcentaje de comisión <span ng-show="vendedorCobrador.rol == 3">vendedor</span></label> | |
| 193 | 194 | <div class="input-group col-md-8 pl-0"> |
| 194 | 195 | <input |
| 195 | 196 | class="form-control form-control-sm" |
| ... | ... | @@ -205,6 +206,24 @@ |
| 205 | 206 | /> |
| 206 | 207 | </div> |
| 207 | 208 | </div> |
| 209 | + <div class="form-group d-flex mb-2 col-md-6" | |
| 210 | + ng-show="vendedorCobrador.rol == 2 || vendedorCobrador.rol == 3"> | |
| 211 | + <label class="col-form-label col-md-4">Porcentaje de comisión <span ng-show="vendedorCobrador.rol == 3">cobrador</span></label> | |
| 212 | + <div class="input-group col-md-8 pl-0"> | |
| 213 | + <input | |
| 214 | + class="form-control form-control-sm" | |
| 215 | + foca-tipo-input | |
| 216 | + teclado-virtual | |
| 217 | + ng-model="vendedorCobrador.comisionCobrador" | |
| 218 | + ng-required="true" | |
| 219 | + foca-focus="focused == 10" | |
| 220 | + ng-focus="focused = 10" | |
| 221 | + ng-keypress="next($event.keyCode)" | |
| 222 | + autocomplete="off" | |
| 223 | + string-to-number | |
| 224 | + /> | |
| 225 | + </div> | |
| 226 | + </div> | |
| 208 | 227 | </div> |
| 209 | 228 | </form> |
| 210 | 229 | </div> |