front/core/components/worker-autocomplete/index.js

@@ -7,6 +7,8 @@ export default class WorkerAutocomplete extends Autocomplete {
     }
 
     $onInit() {
+        super.$onInit();
+
         let url = 'Workers/search';
         if (this.departments) {
             const parameter = encodeURIComponent(JSON.stringify(this.departments));
@@ -17,11 +19,11 @@ export default class WorkerAutocomplete extends Autocomplete {
             url: url,
             searchFunction: function({$search}) {
                 return {and: [
-                    {'u.active': {neq: false}},
+                    {'active': {neq: false}},
                     {or: [
-                        {'u.name': $search},
+                        {'name': $search},
-                        {'u.nickname': {like: '%' + $search + '%'}},
+                        {'nickname': {like: '%' + $search + '%'}},
-                        {'w.code': {like: $search + '%'}}
+                        {'code': {like: $search + '%'}}
                     ]}
                 ]};
             },

modules/claim/front/basic-data/index.html

@@ -34,6 +34,9 @@
                 where="{role: 'salesPerson'}"
                 label="Attended by">
             </vn-autocomplete>
+            <vn-worker-autocomplete
+                ng-model="$ctrl.claim.workerFk">
+            </vn-worker-autocomplete>
             <vn-autocomplete
                 ng-model="$ctrl.claim.claimStateFk"
                 data="claimStates"

modules/worker/back/methods/worker/search.js

@@ -40,12 +40,15 @@ module.exports = Self => {
             filter = mergeFilters(filter, {where});
         }
 
-        const stmt = new ParameterizedSQL(
+        const stmt = new ParameterizedSQL(`
-            `SELECT DISTINCT w.id, w.code, u.name, u.nickname
+            SELECT *
-                FROM worker w
+                FROM(
-                    JOIN account.user u ON u.id = w.id
+                    SELECT DISTINCT w.id, w.code, u.name, u.nickname, u.active
-                    JOIN business b ON b.workerFk = w.id
+                        FROM worker w
-                    JOIN department d ON d.id = b.departmentFk`);
+                            JOIN account.user u ON u.id = w.id
+                            JOIN business b ON b.workerFk = w.id
+                            JOIN department d ON d.id = b.departmentFk
+                ) w`);
 
         stmt.merge(conn.makeSuffix(filter));
         return conn.executeStmt(stmt);