eztech-core-components 1.0.69 → 1.0.74

package/comps/Custom/UserRoles.vue

@@ -46,7 +46,7 @@
               project-id="5"
               :col_multiple="true"
               :disabled="!isSetRole"
-              ref_column="name"
+              ref_column="name,is_active"
               :trigger_fields="roleTriggerFields"
               @input="($event) => handleChangeRole(scope.row._id, $event)"
             />
@@ -82,10 +82,11 @@ export default {
       return this.level?.is_admin
     },
     roleTriggerFields () {
-      if (this.isAdmin) {
-        return null
+      let val = 'is_active:true:boolean:eq'
+      if (!this.isAdmin) {
+        val += ',is_admin:false:boolean:eq'
       }
-      return 'is_admin:false:boolean:eq'
+      return val
     }
   },
   watch: {

package/comps/Custom/UserSelect.vue

@@ -182,8 +182,11 @@ export default {
     isRegConfirmUser () {
       return this.col_field?.includes('reg_confirm_user_id')
     },
+    isDriver () {
+      return this.col_field === 'driver_id'
+    },
     isRoleUsers () {
-      return this.isRegUsers || this.isExpertUsers || this.isPsychologists || this.isFirearmExpert || this.isGrantExpert || this.isRegConfirmUser
+      return this.isDriver || this.isRegUsers || this.isExpertUsers || this.isPsychologists || this.isFirearmExpert || this.isGrantExpert || this.isRegConfirmUser
     },
     isMultiple () {
       return getFormBoolean(this.col_multiple)
@@ -381,7 +384,19 @@ export default {
           triggerSearch[localKey] = { val: localVal, t: type, op: operation }
         }
       }
-      if (this.isRoleUsers) {
+      if (this.isDriver) {
+        const { data: list } = await this.$axios.get('forensic/driver/users', {
+          process: false,
+          cancelToken: new CancelToken(function executor (c) {
+            that.cancel = c
+          }),
+          params: {
+            searchText: this.searchText,
+            search: JSON.stringify(triggerSearch)
+          }
+        })
+        this.list = list
+      } else if (this.isRoleUsers) {
         const { data: list } = await this.$axios.get('forensic/role/users', {
           process: false,
           cancelToken: new CancelToken(function executor (c) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eztech-core-components",
-  "version": "1.0.69",
+  "version": "1.0.74",
   "publishConfig": {
     "access": "public"
   },

package/utils/component-helper.js

@@ -1,10 +1,17 @@
 import { getFormBoolean } from './data-helper'
 
 export const getFormComponent = ({
-  col_field, col_type, col_readonly,
-  col_multiple, col_length, ref_table,
-  ref_column, trigger_fields, enum_values,
-  col_default, is_file_secret
+  col_field,
+  col_type,
+  col_readonly,
+  col_multiple,
+  col_length,
+  ref_table,
+  ref_column,
+  trigger_fields,
+  enum_values,
+  col_default,
+  is_file_secret
 }, {
   isInline = false,
   formReadonly = false,
@@ -182,7 +189,7 @@ export const getFormComponent = ({
       name = 'CustomUserSelect'
     } else if (['organization_id', 'parent_id'].some(c => col_field.includes(c)) && !['other_organization_id', 'rest_organization_id'].some(c => col_field.includes(c))) {
       name = 'CoreSelectTree'
-    } else if (ref_table === 'hrm_employees') {
+    } else if (ref_table === 'hrm_employees' && col_multiple) {
       name = 'HrmEmployeeSelect'
     } else {
       name = 'CoreSelect'
@@ -305,11 +312,15 @@ export const getColWidth = ({ col_type, col_multiple, col_length, col_key, col_f
   }
   return valWidth
 }
-export const isHidden = ({ col_field, col_hidden }, subColumn) => {
-  if (['oid', 'xyp_log_id', 'created_user_id'].includes(col_field)) {
+export const isHidden = ({ col_field, col_hidden }, subColumn, apiName) => {
+  const isColHidden = getFormBoolean(col_hidden)
+  if (isColHidden && apiName?.includes('vw_rprt') && ['current_user_id'].includes(col_field)) {
+    return false
+  }
+  if (!isColHidden && ['oid', 'xyp_log_id', 'created_user_id'].includes(col_field)) {
     return true
   }
-  if (getFormBoolean(col_hidden)) {
+  if (isColHidden) {
     return true
   }
   if (subColumn) {

package/utils/table-helper.js

@@ -35,7 +35,7 @@ export const tableWatch = {
 }
 export const tableComputed = {
   ...mapGetters('settings', ['unsavedChanges', 'loadingWindow', 'env']),
-  ...mapGetters(['user_position_id', 'refs', 'regYear']),
+  ...mapGetters(['user_position_id', 'refs', 'regYear', 'isClosedRegYear']),
   ...mapGetters('user', ['token', 'authType']),
   localeId () {
     return this.tempLocaleId || this.locale?._id || (this.locales?.length ? this.locales[0]._id : null)
@@ -535,7 +535,12 @@ export const tableMethods = {
         if (['decimal', 'number'].includes(col.col_type)) {
           trigger = 'blur'
         }
-        rules[col.col_field].push({ type: ruleType, required: true, trigger, message: options?.noMessage ? ' ' : `"${col.form.label || (col.props && col.props.label) || 'no label'}" утга шаардана.` })
+        rules[col.col_field].push({
+          type: ruleType,
+          required: true,
+          trigger,
+          message: options?.noMessage ? ' ' : `"${col.form.label || (col.props && col.props.label) || 'no label'}" утга шаардана.`
+        })
       } else if (trigger_required) {
         let trigger = 'change'
         if (['decimal', 'number'].includes(col.col_type)) {
@@ -551,11 +556,19 @@ export const tableMethods = {
         })
       }
       if (col.col_field && col.col_field.toLowerCase().endsWith('mail')) {
-        rules[col.col_field].push({ type: 'email', trigger: 'change', message: options?.noMessage ? ' ' : `"${col.form.label || (col.props && col.props.label) || 'no label'}" буруу байна.` })
+        rules[col.col_field].push({
+          type: 'email',
+          trigger: 'change',
+          message: options?.noMessage ? ' ' : `"${col.form.label || (col.props && col.props.label) || 'no label'}" буруу байна.`
+        })
       } else {
         const { pattern, patternMessage } = getRegexp(col.col_field, col.form.pattern)
         if (pattern) {
-          rules[col.col_field].push({ type: 'regexp', pattern, trigger: 'change', message: options?.noMessage ? ' ' : `${patternMessage || 'Утга буруу байна.'}` })
+          rules[col.col_field].push({
+            type: 'regexp',
+            pattern, trigger: 'change',
+            message: options?.noMessage ? ' ' : `${patternMessage || 'Утга буруу байна.'}`
+          })
         }
       }
       if (col.form.min) {
@@ -1346,6 +1359,7 @@ export const tableMethods = {
 
 export const getAsyncData = async ({
   $axios,
+  store,
   projectId,
   tableName,
   apiName,
@@ -1458,7 +1472,7 @@ export const getAsyncData = async ({
         ref_table: col.ref_table,
         ref_column: col.ref_column,
         trigger_fields: col.trigger_fields,
-        col_hidden: isHidden(col, subColumn),
+        col_hidden: isHidden(col, subColumn, apiName),
         col_length: col.col_length,
         col_nullable: col.col_nullable,
         col_multiple: col.col_multiple,
@@ -1623,6 +1637,9 @@ export const getAsyncData = async ({
       if (c.col_type === 'pkid') {
         return true
       }
+      if (c.col_field === 'year' && c.col_default === 'current_reg_year' && store?.getters?.isClosedRegYear) {
+        return false
+      }
       return true
     })
     return showColumns