Merge branch 'master' into 'master'

Master See merge request modulos-npm/foca-admin-seguimiento!6

Merge branch 'master' into 'master'
Master See merge request modulos-npm/foca-admin-seguimiento!6
Eric Fernandez
2 parents 401c68dfde 04a8bedc6f
Showing 1 changed file Show diff stats
src/views/foca-admin-seguimiento.html
@@ -29,15 +29,25 @@
                 class="btn col-12 my-1" 
                 ng-click="individual()"
             >Individual</button>
-            <div class="form-group">
+            <div class="form-group" ng-show="idUsuario == -1">
                 <input 
                     type="text"
                     placeholder="Vendedor"
                     class="form-control"
                     ng-model="idUsuarioInput"
-                    ng-show="idUsuario == -1"
+                    ng-show="actividad"
                     ng-keypress="search($event.keyCode)"
                     foca-focus="idUsuario == -1"
+                    ng-show="actividad == 'Nota de pedido'"
+                >
+                <input 
+                    type="text"
+                    placeholder="Vehiculo"
+                    class="form-control"
+                    ng-model="idUsuarioInput"
+                    ng-keypress="search($event.keyCode)"
+                    foca-focus="idUsuario == -1"
+                    ng-show="actividad == 'Entrega de producto'"
                 >
             </div>
             <button
...	...	@@ -29,15 +29,25 @@
29	29	class="btn col-12 my-1"
30	30	ng-click="individual()"
31	31	>Individual</button>
32		- <div class="form-group">
	32	+ <div class="form-group" ng-show="idUsuario == -1">
33	33	<input
34	34	type="text"
35	35	placeholder="Vendedor"
36	36	class="form-control"
37	37	ng-model="idUsuarioInput"
38		- ng-show="idUsuario == -1"
	38	+ ng-show="actividad"
39	39	ng-keypress="search($event.keyCode)"
40	40	foca-focus="idUsuario == -1"
	41	+ ng-show="actividad == 'Nota de pedido'"
	42	+ >
	43	+ <input
	44	+ type="text"
	45	+ placeholder="Vehiculo"
	46	+ class="form-control"
	47	+ ng-model="idUsuarioInput"
	48	+ ng-keypress="search($event.keyCode)"
	49	+ foca-focus="idUsuario == -1"
	50	+ ng-show="actividad == 'Entrega de producto'"
41	51	>
42	52	</div>
43	53	<button