eztech-core-components 1.0.13 → 1.0.14

package/comps/CoreFormTable.vue

@@ -27,6 +27,7 @@
       :locales="locales"
       :locale.sync="locale"
       :is-admin="isAdmin"
+      :is-sub="true"
       :statuses="statuses"
       :status-count="statusCount"
       @load="handleRefreshList"

package/comps/CoreTable.vue

@@ -470,6 +470,7 @@ export default {
     locale: { type: Object, default: () => { return null } },
     locales: { type: Array, default: () => { return [] } },
     isAdmin: { type: Boolean, default: false },
+    isSub: { type: Boolean, default: false },
     actions: { type: Array, default: () => { return [] } },
     cellClassName: { type: Function, default: null },
     rowClassName: { type: Function, default: null },
@@ -563,7 +564,7 @@ export default {
       return list
     },
     buttons () {
-      return getButtons(this.level, this.table_name, this.isAdmin)
+      return getButtons(this.level, this.table_name, this.isAdmin, this.isSub)
     },
     contextMenuItems () {
       if (this.readOnly) {

package/comps/Custom/UserClotheRow.vue

@@ -1,5 +1,8 @@
 <template>
-  <tr class="border-b">
+  <tr :class="['border-b', {
+    'bg-coreDanger/20 text-coreDanger font-bold !border-b-coreDanger/30': value?.next_receive_date && $moment(value?.next_receive_date).isBefore($moment()),
+    'bg-coreWarning/20 text-coreWarning font-bold !border-b-coreWarning/30': value?.next_receive_date && $moment().isBefore(value?.next_receive_date) && $moment().add(10, 'days').isAfter(value.next_receive_date)
+  }]">
     <td class="text-center">
       {{ ind + 1 }}
     </td>

package/comps/Custom/UserClothes.vue

@@ -110,7 +110,10 @@
                   {{ item.clothe_reg_id?.type_general_id?.name }}
                 </td>
               </tr>
-              <tr :key="item._id" class="border-b">
+              <tr :key="item._id" :class="['border-b', {
+                'bg-coreDanger/20 text-coreDanger font-bold !border-b-coreDanger/30': !item.next_receive_date || $moment(item.next_receive_date).isBefore($moment()),
+                'bg-coreWarning/20 text-coreWarning font-bold !border-b-coreWarning/30': item.next_receive_date && $moment().isBefore(item.next_receive_date) && $moment().add(10, 'days').isAfter(item.next_receive_date)
+              }]">
                 <td class="text-center">
                   {{ index + 1 }}
                 </td>
@@ -177,7 +180,10 @@
                 Хугацаа болсон авах хувцас хэрэгсэл байхгүй байна..
               </td>
             </tr>
-            <tr v-for="(item, index) in expiredClothes" :key="item._id" class="border-b">
+            <tr v-for="(item, index) in expiredClothes" :key="item._id" :class="['border-b', {
+              'bg-coreDanger/20 text-coreDanger font-bold !border-b-coreDanger/30': !item.next_receive_date || $moment(item.next_receive_date).isBefore($moment()),
+              'bg-coreWarning/20 text-coreWarning font-bold !border-b-coreWarning/30': item.next_receive_date && $moment().isBefore(item.next_receive_date) && $moment().add(10, 'days').isAfter(item.next_receive_date)
+            }]">
               <td class="text-center">
                 {{ index + 1 }}
               </td>
@@ -199,13 +205,20 @@
           </tbody>
         </table>
       </el-tab-pane>
-      <el-tab-pane label="Бэлэн байгаа хувцасны мэдээлэл">
+      <!-- <el-tab-pane label="Бэлэн байгаа хувцасны мэдээлэл">
         <div class="text-center py-4 text-coreSecondaryText text-sm">
           Түр засвартай байна..
         </div>
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
-    <el-dialog :visible.sync="visible" :title="title" width="950px">
+    <el-dialog
+      :visible.sync="visible"
+      :title="title"
+      width="950px"
+      v-el-drag-dialog
+      append-to-body="appendToBody"
+      :close-on-click-modal="false"
+    >
       <div v-if="visible" class="flex flex-col gap-2">
         <el-alert :closable="false" title="Та хүлээн авсан огноогоо мэдэхгүй бол хоосон үлдээнэ үү." type="warning" show-icon />
         <table class="bg-white rounded w-full text-sm leading-4">
@@ -448,7 +461,7 @@ export default {
           params: {
             search: JSON.stringify({
               employee_id: { op: 'eq', val: this.temp._id, t: 'number' },
-              next_receive_date: { op: 'lt', val: new Date(), t: 'date' }
+              next_receive_date: { op: 'gt', val: new Date(), t: 'date' }
             })
           }
         })

package/package.json

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

package/utils/role-helper.js

@@ -10,9 +10,9 @@ export const groupFieldLog = {
     'deleted_organization_id', 'deleted_position_id', 'deleted_user_id'
   ]
 }
-export const getButtons = (level, table_name, isAdmin) => {
+export const getButtons = (level, table_name, isAdmin, isSub = false) => {
   let textRemove = ''
-  if (table_name === 'hrm_users') {
+  if (table_name === 'hrm_users' && isSub) {
     textRemove = 'Чөлөөлөх'
   }
   if (!level || isAdmin) {