eztech-core-components 1.0.21 → 1.0.23

package/comps/CoreFiles.vue

@@ -325,9 +325,10 @@ export default {
   methods: {
     ...mapActions('settings', ['set_pdf_url']),
     handleChangeDescription (image) {
-      const doRequest = () => this.$axios.post('7/log_files', {
+      const doRequest = () => this.$axios.post('file/description', {
         _id: image._id,
-        description: image.description
+        description: image.description,
+        tid: image.tid
       }).catch((err) => {
         this.$showError(err)
       })

package/comps/CoreForm.vue

@@ -224,6 +224,7 @@
                     :no-search="true"
                     :plain-button="true"
                     :parent-level="level"
+                    :serviceName="serviceName"
                   />
                 </div>
               </fieldset>

package/comps/CoreFormFields.vue

@@ -40,6 +40,7 @@
             :hide-excel="true"
             :no-search="true"
             :plain-button="true"
+            :service-name="serviceName"
           />
         </div>
         <div
@@ -122,8 +123,8 @@
           <training-hrm-material v-else-if="group.name === 'TRAINING_MATERIALS'" :parent-row="temp" :level="level" />
           <training-hrm-material v-else-if="group.name === 'TRAINING_MATERIALS1'" :parent-row="temp" :level="level" />
           <hrm-employee-inquiries v-else-if="group.name === 'HRM_EMPLOYEE_INQUIRIES'" :parent-row="temp" :level="level" />
-          <archive-document-pages v-else-if="group.name === 'ARCHIVE_DOCUMENT_PAGES'" :parent-temp="temp" :parent-root-api-id="rootApiId" :temp-id="temp && temp._id" :level="level" :group="group" :ref-column="refColumns.find(c => c.tableName === group.col_fields)" />
-          <archive-classification-item-pages v-else-if="group.name === 'CLASSIFICATION_ITEM_PAGES'" :parent-temp="temp" :temp-id="temp && temp._id" :level="level" :group="group" :ref-column="refColumns.find(c => c.tableName === group.col_fields)" />
+          <archive-document-pages v-else-if="group.name === 'ARCHIVE_DOCUMENT_PAGES'" :parent-temp="temp" :parent-root-api-id="rootApiId" :temp-id="temp && temp._id" :level="level" :group="group" :ref-column="refColumns.find(c => c.tableName === group.col_fields)" :service-name="serviceName" />
+          <archive-classification-item-pages v-else-if="group.name === 'CLASSIFICATION_ITEM_PAGES'" :parent-temp="temp" :temp-id="temp && temp._id" :level="level" :group="group" :ref-column="refColumns.find(c => c.tableName === group.col_fields)" :service-name="serviceName" />
         </div>
         <template v-else>
           <template

package/comps/CoreFormSub.vue

@@ -48,7 +48,8 @@ export default {
     noSearch: { type: Boolean, default: false },
     plainButton: { type: Boolean, default: false },
     apiName: { type: String, default: null },
-    showPkid: { type: Boolean, default: false }
+    showPkid: { type: Boolean, default: false },
+    serviceName: { type: String, default: null }
   },
   data () {
     return {
@@ -77,6 +78,9 @@ export default {
     ...tableComputed,
     tableName () {
       return this.table?.name
+    },
+    subUrl () {
+      return `sub/${this.serviceName}/${this.tempId}/`
     }
   },
   watch: {

package/comps/CoreXypService.vue

@@ -190,22 +190,12 @@ export default {
         this.result_message = null
         this.id = null
         this.xypServiceDetails = []
-        const { data: xypService } = await this.$axios.get('one/7/xyp_services', {
-          params: {
-            search: JSON.stringify({
-              name: { val: this.serviceName, t: 'string', op: 'eq' }
-            })
-          }
-        })
-        if (!xypService._id) {
-          this.$customError('Сервис олдсонгүй')
+        const params = {}
+        if (this.xypLogId) {
+          params.xypLogId = this.xypLogId
         }
-        const { data: xypServiceDetails } = await this.$axios.get('list/7/xyp_service_details', {
-          params: {
-            search: JSON.stringify({
-              service_id: { val: xypService._id, t: 'number', op: 'eq' }
-            })
-          }
+        const { data: { xypService, xypServiceDetails, xypLog } } = await this.$axios.get(`xypservice/service/log/${this.serviceName}`, {
+          params
         })
         const requestData = {}
         for (const itemInput of xypServiceDetails.filter(c => c.is_input)) {
@@ -214,13 +204,12 @@ export default {
         this.request = { ...requestData, ...this.defaultRequest }
         this.xypService = xypService
         this.xypServiceDetails = xypServiceDetails
-        if (this.xypLogId) {
-          const { data } = await this.$axios.get(`7/xyp_logs/${this.xypLogId}`)
-          this.request = data.request
-          this.response = data.response
-          this.id = data._id
-          this.created_at = data.created_at
-          this.result_message = data.result_message
+        if (xypLog) {
+          this.request = xypLog.request
+          this.response = xypLog.response
+          this.id = xypLog._id
+          this.created_at = xypLog.created_at
+          this.result_message = xypLog.result_message
         }
       } catch (err) {
         this.$showError(err)

package/comps/Custom/CrimeDescription.vue

@@ -176,7 +176,7 @@ export default {
       if (!this.$attrs.value) {
         return null
       }
-      const { data } = await this.$axios.get('list/5/reg_resolutions', {
+      const { data } = await this.$axios.get('list/5/service_search_reg_resolutions', {
         params: {
           search: JSON.stringify({
             crime_description: { val: this.$attrs.value, t: 'string', op: 'start' },

package/comps/Custom/EmployeeSelect.vue

@@ -147,7 +147,7 @@ export default {
         if (!this.modelValue || this.item) {
           return
         }
-        const { data: item } = await this.$axios.get('one/5/hrm_users', {
+        const { data: item } = await this.$axios.get('one/5/service_search_hrm_users', {
           process: false,
           params: {
             search: JSON.stringify({
@@ -222,7 +222,7 @@ export default {
           triggerSearch[localKey] = { val: localVal, t: type, op: operation }
         }
       }
-      const { data: list } = await this.$axios.get('list/5/hrm_users', {
+      const { data: list } = await this.$axios.get('list/5/service_search_hrm_users', {
         process: false,
         params: {
           search: JSON.stringify({

package/comps/Custom/NationalLangSkills.vue

@@ -74,7 +74,7 @@ export default {
         if (this.timeout[type?._id]) {
           clearTimeout(this.timeout[type?._id])
         }
-        this.timeout[type?._id] = setTimeout(() => this.$axios.post('5/hrm_employee_national_lang_skills', { ...changedItem }).catch(this.$showError), 2000)
+        this.timeout[type?._id] = setTimeout(() => this.$axios.post('5/service_hrm_employee_national_lang_skills', { ...changedItem }).catch(this.$showError), 2000)
       } catch (err) {
         this.$showError(err)
       }
@@ -95,7 +95,7 @@ export default {
           changedItem = { employee_id: this.temp._id, skill_id: type, rate_id: rate }
           this.list.push({ ...changedItem })
         }
-        await this.$axios.post('5/hrm_employee_national_lang_skills', { ...changedItem })
+        await this.$axios.post('5/service_hrm_employee_national_lang_skills', { ...changedItem })
       } catch (err) {
         this.$showError(err)
       } finally {
@@ -114,18 +114,12 @@ export default {
           return
         }
         this.loading = true
-        const { data } = await this.$axios.get('list/5/hrm_employee_national_lang_skills', {
-          params: {
-            search: JSON.stringify({
-              employee_id: { op: 'eq', val: this.temp._id, t: 'number' }
-            })
-          }
+        const { data } = await this.$axios.get(`hrm/user/national/lang/skills/${this.temp._id}`, {
+          params: { tid: this.temp.tid }
         })
-        const { data: skillTypes } = await this.$axios.get('list/5/ref_hrm_national_lang_skills')
-        const { data: skillRates } = await this.$axios.get('list/5/ref_hrm_national_lang_rates')
-        this.skillTypes = skillTypes
-        this.skillRates = skillRates
-        this.list = data
+        this.skillTypes = data.skillTypes
+        this.skillRates = data.skillRates
+        this.list = data.list
       } catch (err) {
         this.$showError(err)
       } finally {

package/comps/Custom/UserClothes.vue

@@ -216,7 +216,7 @@
       :title="title"
       width="950px"
       v-el-drag-dialog
-      append-to-body="appendToBody"
+      append-to-body
       :close-on-click-modal="false"
     >
       <div v-if="visible" class="flex flex-col gap-2">
@@ -426,52 +426,18 @@ export default {
           return
         }
         this.loading = true
-        const { data: clotheRegs } = await this.$axios.get('list/5/ref_clothe_regs', {
+        const { data } = await this.$axios.get(`hrm/user/clothes/${this.temp._id}`, {
           params: {
-            extraFields: 'type_general_id.clothe_sizes,type_general_id.sort_order'
+            tid: this.temp.tid
           }
         })
-        const { data: list } = await this.$axios.get('list/5/hrm_employee_clothe_sizes', {
-          params: {
-            search: JSON.stringify({
-              employee_id: { op: 'eq', val: this.temp._id, t: 'number' }
-            })
-          }
-        })
-        const { data: types } = await this.$axios.get('list/5/ref_clothe_general_types', {
-          params: {
-            search: JSON.stringify({
-              clothe_sizes: { op: 'eq', val: 'notnull', t: 'string' }
-            })
-          }
-        })
-        const { data: clothes } = await this.$axios.get('list/5/service_clothe_tamachis', {
-          params: {
-            search: JSON.stringify({
-              employee_id: { op: 'eq', val: this.temp._id, t: 'number' }
-            }),
-            sorts: JSON.stringify([
-              { prop: 'clothe_reg_id.type_general_id.sort_order', order: 'ascending' },
-              { prop: 'clothe_reg_id.sort_order', order: 'ascending' }
-            ]),
-            extraFields: 'clothe_reg_id.type_general_id.sort_order,clothe_reg_id.sort_order,clothe_reg_id.type_general_id.name'
-          }
-        })
-        const { data: expiredClothes } = await this.$axios.get('list/5/service_clothe_tamachis', {
-          params: {
-            search: JSON.stringify({
-              employee_id: { op: 'eq', val: this.temp._id, t: 'number' },
-              next_receive_date: { op: 'gt', val: new Date(), t: 'date' }
-            })
-          }
-        })
-        this.expiredClothes = expiredClothes
-        this.types = types
-        this.list = list
+        this.expiredClothes = data.expiredClothes
+        this.types = data.types
+        this.list = data.list
         // каракуль малгай зөвхөн хурандаа нарт олгоно
         const isCarakulCat = this.temp?.employee_degree_text?.toLowerCase()?.includes('цагдаагийн хурандаа')
-        this.clotheRegs = clotheRegs.filter(c => isCarakulCat || (!isCarakulCat && c.name?.toLowerCase() !== 'каракуль малгай'))
-        this.clothes = clothes
+        this.clotheRegs = data.clotheRegs.filter(c => isCarakulCat || (!isCarakulCat && c.name?.toLowerCase() !== 'каракуль малгай'))
+        this.clothes = data.clothes
       } catch (err) {
         this.$showError(err)
       } finally {

package/comps/Custom/UserRoles.vue

@@ -108,7 +108,7 @@ export default {
         if (checkItem) {
           const item = { employee_id: this.temp._id, user_id: { _id: userId }, role_group_id: checkItem }
           this.roles.push(item)
-          const { data } = await this.$axios.post('5/hrm_user_role_groups', item)
+          const { data } = await this.$axios.post('5/service_hrm_user_role_groups', item)
           item._id = data._id
           item.tid = data.tid
         } else {
@@ -117,7 +117,7 @@ export default {
             const itemId = this.roles[removeIndex]._id
             const itemTid = this.roles[removeIndex].tid
             this.roles.splice(removeIndex, 1)
-            await this.$axios.delete(`5/hrm_user_role_groups/${itemId}`, {
+            await this.$axios.delete(`5/service_hrm_user_role_groups/${itemId}`, {
               data: { tid: itemTid }
             })
           }
@@ -139,25 +139,13 @@ export default {
           return
         }
         this.loading = true
-        const { data } = await this.$axios.get('list/5/hrm_users', {
+        const { data } = await this.$axios.get(`hrm/users/${this.temp._id}`, {
           params: {
-            search: JSON.stringify({
-              employee_id: { op: 'eq', val: this.temp._id, t: 'number' },
-              end_date: { op: 'eq', val: 'null', t: 'date' }
-            })
+            tid: this.temp.tid
           }
         })
-        if (data.length > 0) {
-          const { data: roles } = await this.$axios.get('list/5/hrm_user_role_groups', {
-            params: {
-              search: JSON.stringify({
-                user_id: { op: 'in', val: data.map(c => c._id).join(','), t: 'number' }
-              })
-            }
-          })
-          this.roles = roles
-          this.list = data
-        }
+        this.roles = data.roles
+        this.list = data.list
       } catch (err) {
         this.$showError(err)
       } finally {

package/comps/Custom/UserSelect.vue

@@ -282,7 +282,7 @@ export default {
         if (!id) {
           return
         }
-        const { data: item } = await this.$axios.get('one/5/hrm_users', {
+        const { data: item } = await this.$axios.get('one/5/service_search_hrm_users', {
           process: false,
           params: {
             search: JSON.stringify({
@@ -396,7 +396,7 @@ export default {
         })
         this.list = list
       } else {
-        const { data: list } = await this.$axios.get('list/5/hrm_users', {
+        const { data: list } = await this.$axios.get('list/5/service_search_hrm_users', {
           process: false,
           params: {
             search: JSON.stringify({

package/comps/Custom/UserSkills.vue

@@ -59,7 +59,7 @@ export default {
           changedItem = { employee_id: this.temp._id, skill_type_id: item, rate_value: $event }
           this.list.push({ ...changedItem })
         }
-        await this.$axios.post('5/hrm_employee_skill_types', { ...changedItem })
+        await this.$axios.post('5/service_hrm_employee_skill_types', { ...changedItem })
       } catch (err) {
         this.$showError(err)
       } finally {
@@ -77,16 +77,11 @@ export default {
           return
         }
         this.loading = true
-        const { data } = await this.$axios.get('list/5/hrm_employee_skill_types', {
-          params: {
-            search: JSON.stringify({
-              employee_id: { op: 'eq', val: this.temp._id, t: 'number' }
-            })
-          }
+        const { data } = await this.$axios.get(`hrm/user/skill/types/${this.temp._id}`, {
+          params: { tid: this.temp.tid }
         })
-        const { data: skillTypes } = await this.$axios.get('list/5/ref_hrm_skill_types')
-        this.skillTypes = skillTypes
-        this.list = data
+        this.skillTypes = data.skillTypes
+        this.list = data.list
       } catch (err) {
         this.$showError(err)
       } finally {

package/package.json

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

package/utils/component-helper.js

@@ -39,7 +39,7 @@ export const getFormComponent = ({
     props = { ...props, type: 'textarea', maxlength: col_length || 255, showWordLimit: true, style: 'font-family: Mongolian Baiti; font-size: 20px; writing-mode: vertical-lr; line-height: 1.15' }
   } else if (['doc_controls', 'doc_requests', 'doc_request_receives'].includes(table_name) && col_field === 'reg_num') {
     name = 'DocRegNum'
-    props.table_type = table_name
+    props.tableType = table_name
   } else if (table_name === 'doc_controls' && col_field === 'doc_num') {
     name = 'DocIndexNum'
   } else if (col_type === 'json') {

package/utils/table-helper.js

@@ -46,11 +46,11 @@ export const tableComputed = {
   url () {
     return this.customUrl || `${this.subUrl || ''}${this.projectId}/${this.tableName}`
   },
-  urlOne () {
+  urlGet () {
     return this.customUrl || `${this.subUrl || ''}${this.projectId}/${this.tableName}`
   },
-  urlTable () {
-    return `${this.subUrl || ''}${this.projectId}/${this.table?.name}`
+  urlOne () {
+    return this.customOneUrl || `${this.subUrl || ''}one/${this.projectId}/${this.tableName}`
   },
   urlExcel () {
     return this.customExcelUrl || `${this.subUrl || ''}excel/${this.url}`
@@ -220,7 +220,7 @@ export const tableMethods = {
       if (col_field === 'register_num') {
         const isEmployee = this.table?.name === 'hrm_employees'
         if (isEmployee && !this.temp?._id) {
-          const { data } = await this.$axios.get(`one/${this.urlTable}`, {
+          const { data } = await this.$axios.get(`one/service_search_hrm_employees`, {
             params: {
               search: JSON.stringify({ [col_field]: { val: this.temp[col_field], t: 'string', op: 'eq' } }),
               locale_id: this.localeId,
@@ -679,7 +679,7 @@ export const tableMethods = {
         if (this.customExtraFields) {
           extraFields.push(...this.customExtraFields?.split(','))
         }
-        const { data } = await this.$axios.get(`${this.urlOne}/${id}`, {
+        const { data } = await this.$axios.get(`${this.urlGet}/${id}`, {
           params: {
             locale_id,
             extraFields: extraFields.join(','),
@@ -731,7 +731,7 @@ export const tableMethods = {
           }
         }
         // const select = this.columns.filter(c => c.col_field).map((c) => { return c.col_field })
-        const { data } = await this.$axios.get(`one/${this.urlOne}`, {
+        const { data } = await this.$axios.get(`${this.urlOne}`, {
           params: {
             // reApi: this.reApi,
             // select,
@@ -1368,6 +1368,7 @@ export const getAsyncData = async ({
     columnUsers,
     statuses
   } = data
+  // console.log('data', data)
   if (!level && checkPermission) {
     error({ statusCode: 402 })
   }