@7365admin1/layer-common 1.11.6 → 1.11.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.7
+
+### Patch Changes
+
+- 82d039f: Update version
+
 ## 1.11.6
 
 ### Patch Changes

package/components/AreaChecklistHistoryMain.vue

@@ -81,6 +81,7 @@ const props = defineProps({
   site: { type: String, required: true, default: "" },
   scheduleAreaId: { type: String, required: true, default: "" },
   type: { type: String, required: true, default: "cleaner" },
+  scheduleRoute: { type: String, default: "cleaning-schedule" },
 });
 
 const { formatDate } = useUtils();
@@ -169,7 +170,7 @@ function handleRowClick(data: any) {
       navigateTo(path);
       return;
     }
-    const path = `/${props.orgId}/${props.site}/cleaning-schedule/${props.scheduleAreaId}/history/${id}`;
+    const path = `/${props.orgId}/${props.site}/${props.scheduleRoute}/${props.scheduleAreaId}/history/${id}`;
     navigateTo(path);
   }
 }

package/components/AreaFormDialog.vue

@@ -146,6 +146,9 @@
 </template>
 
 <script setup lang="ts">
+import useUnits from '../composables/useUnits';
+import useUtils from '../composables/useUtils';
+
 const model = defineModel("name", { type: String, default: "" });
 const typeModel = defineModel("type", { type: String, default: "Common" });
 const set = defineModel("set", { type: Number, default: 1 });
@@ -167,6 +170,7 @@ const prop = defineProps({
   showOptional: { type: Boolean, default: true },
   showUnits: { type: Boolean, default: false },
   site: { type: String, default: "" },
+  serviceType: { type: String, default: "" },
 });
 
 const emit = defineEmits(["saved", "close"]);
@@ -196,7 +200,7 @@ watch(
     if (isOpen && shouldShow && siteId) {
       loadingUnits.value = true;
       try {
-        const response = await getUnits({ site: siteId, limit: 100 });
+        const response = await getUnits({ site: siteId, limit: 100, serviceType: prop.serviceType });
         unitItems.value = (response?.items || []).map((unit: any) => ({
           title: unit.name,
           value: unit._id || unit.id,

package/components/AreaMain.vue

@@ -147,6 +147,7 @@
     :entityType="entityTypeLabel"
     :showUnits="true"
     :site="props.site"
+    :serviceType="props.serviceType"
     @saved="_createArea"
   />
 
@@ -365,6 +366,7 @@ const props = defineProps({
   site: { type: String, default: "" },
   type: { type: String, default: "" },
   serviceType: { type: String, default: "" },
+  scheduleRoute: { type: String, default: "cleaning-schedule" },
 });
 
 const isCleanerArea = computed(() => {
@@ -467,20 +469,6 @@ const {
   }
 );
 
-const { data: getUnitsReq } = await useLazyAsyncData(
-  `get-all-units-${props.site}`,
-  () =>
-    getUnits({
-      site: props.site,
-      limit: 100,
-    }),
-  {
-    watch: [() => props.site],
-  }
-);
-
-const allUnits = computed(() => getUnitsReq.value?.items || []);
-
 watchEffect(() => {
   if (getTaskReq.value) {
     items.value = getTaskReq.value.items;
@@ -511,6 +499,26 @@ const dialogDeleteItem = ref(false);
 const dialogShowQR = ref(false);
 const dialogMode = ref<"add" | "edit">("add");
 
+const allUnits = ref<Array<Record<string, any>>>([]);
+
+watch(
+  [dialogShowForm, () => props.site],
+  async ([isOpen, siteId]) => {
+    if (isOpen && siteId) {
+      try {
+        const response = await getUnits({
+          site: siteId,
+          limit: 100,
+          serviceType: props.serviceType,
+        });
+        allUnits.value = response?.items || [];
+      } catch {
+        allUnits.value = [];
+      }
+    }
+  }
+);
+
 const editingItem = ref<Record<string, any>>({});
 const itemName = ref("");
 const itemType = ref("");
@@ -758,7 +766,7 @@ const onManageFromMoreAction = () => {
     if (isToiletArea.value) {
       path = `/${props.orgId}/${props.site}/toilet-checklist/toilet/${id}`;
     } else {
-      path = `/${props.orgId}/${props.site}/cleaning-schedule/area/${id}`;
+      path = `/${props.orgId}/${props.site}/${props.scheduleRoute}/area/${id}`;
     }
     navigateTo(path);
   } else {

package/components/CleaningScheduleMain.vue

@@ -110,6 +110,8 @@ const props = defineProps({
   orgId: { type: String, required: true },
   site: { type: String, required: true },
   type: { type: String, required: true },
+  serviceType: { type: String, default: "" },
+  scheduleRoute: { type: String, default: "cleaning-schedule" },
 });
 
 const startDate = ref("");
@@ -190,6 +192,7 @@ const {
       startDate: startDate.value,
       endDate: endDate.value,
       status: status.value === "All" ? undefined : status.value,
+      serviceType: props.serviceType,
     }),
   {
     watch: [() => page.value, () => props.site, startDate, endDate, status],
@@ -312,7 +315,7 @@ function onRowClick(data: any) {
       navigateTo(path);
       return;
     }
-    const path = `/${props.orgId}/${props.site}/cleaning-schedule/${id}`;
+    const path = `/${props.orgId}/${props.site}/${props.scheduleRoute}/${id}`;
     navigateTo(path);
   } else {
     console.warn("Row clicked but no id found to navigate:", item);

package/components/EquipmentManagementMain.vue

@@ -253,6 +253,7 @@ import useUtils from "../composables/useUtils";
 const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
+  serviceType: { type: String, default: "" },
 });
 
 const {
@@ -302,6 +303,7 @@ const {
       page: page.value,
       search: searchInput.value,
       site: props.site,
+      serviceType: props.serviceType,
     }),
   {
     watch: [page, () => props.site],
@@ -311,6 +313,7 @@ const {
 watchEffect(() => {
   if (getEquipmentsReq.value) {
     items.value = getEquipmentsReq.value.items;
+
     pages.value = getEquipmentsReq.value.pages;
     pageRange.value = getEquipmentsReq.value.pageRange;
   }
@@ -375,7 +378,7 @@ async function _createEquipment() {
       if (!id) throw new Error("Invalid equipment id for update");
       response = await updateEquipment(id, payload);
     } else {
-      response = await createEquipment(payload, props.site);
+      response = await createEquipment(payload, props.site, props.serviceType);
     }
 
     showMessage(response?.message, "success");