@7365admin1/layer-common 1.8.5 → 1.8.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/components/BuildingManagement/buildings.vue +6 -1
- package/components/BuildingManagement/units.vue +7 -1
- package/components/CameraMain.vue +9 -4
- package/components/FeedbackMain.vue +16 -6
- package/components/NumberSettingField.vue +3 -2
- package/components/WorkOrder/Main.vue +25 -4
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
</v-toolbar>
|
|
29
29
|
|
|
30
30
|
<v-data-table :headers="headers" :items="items" item-value="_id" items-per-page="20" fixed-header
|
|
31
|
-
hide-default-footer
|
|
31
|
+
hide-default-footer @click:row="tableRowClickHandler"
|
|
32
32
|
style="max-height: calc(100vh - (200px))">
|
|
33
33
|
<template #item.createdAt="{ value }">
|
|
34
34
|
{{ new Date(value).toLocaleDateString() }}
|
|
@@ -333,3 +333,8 @@ function setBuilding({
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
</script>
|
|
336
|
+
<style scoped>
|
|
337
|
+
.v-data-table :deep(thead th) {
|
|
338
|
+
font-weight: bold !important;
|
|
339
|
+
}
|
|
340
|
+
</style>
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
</v-toolbar>
|
|
29
29
|
|
|
30
30
|
<v-data-table :headers="props.headers" :items="items" item-value="_id" items-per-page="20" fixed-header
|
|
31
|
-
hide-default-footer
|
|
31
|
+
hide-default-footer @click:row="tableRowClickHandler"
|
|
32
32
|
style="max-height: calc(100vh - (200px))">
|
|
33
33
|
<template #item.block="{ value }">
|
|
34
34
|
{{ value ? `blk ${value}` : "" }}
|
|
@@ -348,3 +348,9 @@ function setBuilding({
|
|
|
348
348
|
}
|
|
349
349
|
}
|
|
350
350
|
</script>
|
|
351
|
+
|
|
352
|
+
<style scoped>
|
|
353
|
+
.v-data-table :deep(thead th) {
|
|
354
|
+
font-weight: bold !important;
|
|
355
|
+
}
|
|
356
|
+
</style>
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
|
|
12
12
|
<template #append>
|
|
13
13
|
<v-btn
|
|
14
|
+
v-if="!prop.readOnly"
|
|
14
15
|
variant="flat"
|
|
15
16
|
color="primary"
|
|
16
17
|
class="text-none"
|
|
@@ -144,7 +145,7 @@
|
|
|
144
145
|
|
|
145
146
|
<v-toolbar class="pa-0" density="compact">
|
|
146
147
|
<v-row no-gutters>
|
|
147
|
-
<v-col cols="6" class="pa-0">
|
|
148
|
+
<v-col :cols="prop.readOnly ? 12 : 6" class="pa-0">
|
|
148
149
|
<v-btn
|
|
149
150
|
block
|
|
150
151
|
variant="text"
|
|
@@ -157,7 +158,7 @@
|
|
|
157
158
|
</v-btn>
|
|
158
159
|
</v-col>
|
|
159
160
|
|
|
160
|
-
<v-col cols="6" class="pa-0">
|
|
161
|
+
<v-col v-if="!prop.readOnly" cols="6" class="pa-0">
|
|
161
162
|
<v-menu>
|
|
162
163
|
<template #activator="{ props }">
|
|
163
164
|
<v-btn
|
|
@@ -176,13 +177,13 @@
|
|
|
176
177
|
<v-list class="pa-0">
|
|
177
178
|
<v-list-item @click="openDialogEdit()">
|
|
178
179
|
<v-list-item-title class="text-subtitle-2">
|
|
179
|
-
Edit
|
|
180
|
+
Edit
|
|
180
181
|
</v-list-item-title>
|
|
181
182
|
</v-list-item>
|
|
182
183
|
|
|
183
184
|
<v-list-item @click="openDialogDelete()" class="text-red">
|
|
184
185
|
<v-list-item-title class="text-subtitle-2">
|
|
185
|
-
Delete
|
|
186
|
+
Delete
|
|
186
187
|
</v-list-item-title>
|
|
187
188
|
</v-list-item>
|
|
188
189
|
</v-list>
|
|
@@ -268,6 +269,10 @@ const prop = defineProps({
|
|
|
268
269
|
{ text: "Actions", value: "action", sortable: false },
|
|
269
270
|
],
|
|
270
271
|
},
|
|
272
|
+
readOnly: {
|
|
273
|
+
type: Boolean,
|
|
274
|
+
default: false,
|
|
275
|
+
},
|
|
271
276
|
});
|
|
272
277
|
|
|
273
278
|
const items = ref<Array<TCamera>>([]);
|
|
@@ -310,7 +310,7 @@ const _feedback = ref({
|
|
|
310
310
|
|
|
311
311
|
const selected = ref<string[]>([]);
|
|
312
312
|
|
|
313
|
-
const { getColorStatus } = useUtils();
|
|
313
|
+
const { getColorStatus, debounce } = useUtils();
|
|
314
314
|
|
|
315
315
|
const headers: Array<Record<string, any>> = [
|
|
316
316
|
{ title: "Name", value: "createdByName", align: "start" },
|
|
@@ -325,6 +325,10 @@ const erroredImages = ref<string[]>([]);
|
|
|
325
325
|
const route = useRoute();
|
|
326
326
|
const { customers } = useCustomer();
|
|
327
327
|
|
|
328
|
+
const dialogPreview = ref(false);
|
|
329
|
+
const selectedFeedback = ref<TFeedback | null>(null);
|
|
330
|
+
const searchText = ref("");
|
|
331
|
+
|
|
328
332
|
const {
|
|
329
333
|
getFeedbacks: _getFeedbacks,
|
|
330
334
|
deleteFeedback,
|
|
@@ -347,6 +351,7 @@ const {
|
|
|
347
351
|
page: page.value,
|
|
348
352
|
site: route.params.site as string,
|
|
349
353
|
category: props.category,
|
|
354
|
+
search: searchText.value || "",
|
|
350
355
|
})
|
|
351
356
|
);
|
|
352
357
|
|
|
@@ -575,14 +580,19 @@ const categories = computed(() =>
|
|
|
575
580
|
);
|
|
576
581
|
|
|
577
582
|
function tableRowClickHandler(_: any, data: any) {
|
|
578
|
-
console.log(data.item);
|
|
583
|
+
// console.log(data.item);
|
|
579
584
|
selectedFeedback.value = data.item;
|
|
580
585
|
dialogPreview.value = true;
|
|
581
586
|
}
|
|
582
587
|
|
|
583
|
-
const dialogPreview = ref(false);
|
|
584
|
-
const selectedFeedback = ref<TFeedback | null>(null);
|
|
585
|
-
const searchText = ref("");
|
|
586
|
-
|
|
587
588
|
getServiceProviderCategories();
|
|
589
|
+
|
|
590
|
+
const debounceSearch = debounce(getAllReqRefresh, 500);
|
|
591
|
+
|
|
592
|
+
watch(
|
|
593
|
+
() => searchText.value,
|
|
594
|
+
() => {
|
|
595
|
+
debounceSearch();
|
|
596
|
+
}
|
|
597
|
+
);
|
|
588
598
|
</script>
|
|
@@ -4,11 +4,11 @@
|
|
|
4
4
|
<v-row>
|
|
5
5
|
<v-col cols="6">
|
|
6
6
|
<InputLabel class="text-capitalize font-weight-bold" :title="title" :required="required" />
|
|
7
|
-
<v-text-field v-model.number="count" type="number" density="comfortable" :rules="rules" />
|
|
7
|
+
<v-text-field v-model.number="count" type="number" density="comfortable" :rules="rules" :readonly="readOnly" />
|
|
8
8
|
</v-col>
|
|
9
9
|
|
|
10
10
|
<v-col cols="6">
|
|
11
|
-
<v-btn color="primary" class="text-none mt-6" size="large" variant="flat"
|
|
11
|
+
<v-btn v-if="!readOnly" color="primary" class="text-none mt-6" size="large" variant="flat"
|
|
12
12
|
:disabled="!valid || disabled" :loading="loading || updating" text="Save" @click="handleSave" />
|
|
13
13
|
</v-col>
|
|
14
14
|
</v-row>
|
|
@@ -34,6 +34,7 @@ const props = defineProps({
|
|
|
34
34
|
siteId: { type: String, required: true },
|
|
35
35
|
existingBlockNumber: { type: Number, default: 0 },
|
|
36
36
|
existingGuardPostsNumber: { type: Number, default: 0 },
|
|
37
|
+
readOnly: { type: Boolean, default: false },
|
|
37
38
|
});
|
|
38
39
|
|
|
39
40
|
const { updateSite, setSiteGuardPosts } = useSiteSettings()
|
|
@@ -91,7 +91,12 @@
|
|
|
91
91
|
<Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
|
|
92
92
|
|
|
93
93
|
<!-- Preview Dialog -->
|
|
94
|
-
<v-dialog
|
|
94
|
+
<v-dialog
|
|
95
|
+
v-model="dialogPreview"
|
|
96
|
+
width="450"
|
|
97
|
+
persistent
|
|
98
|
+
v-if="canViewWorkOrders"
|
|
99
|
+
>
|
|
95
100
|
<v-card width="100%">
|
|
96
101
|
<v-card-text style="max-height: 100vh; overflow-y: auto" class="pb-0">
|
|
97
102
|
<v-row no-gutters v-if="selectedWorkOrder" class="mb-4">
|
|
@@ -139,12 +144,18 @@
|
|
|
139
144
|
</template>
|
|
140
145
|
|
|
141
146
|
<v-list class="pa-0">
|
|
142
|
-
<v-list-item
|
|
147
|
+
<v-list-item
|
|
148
|
+
@click="onViewWorkOrder(selectedWorkOrder)"
|
|
149
|
+
v-if="canViewWorkOrderDetails"
|
|
150
|
+
>
|
|
143
151
|
<v-list-item-title class="text-subtitle-2">
|
|
144
152
|
View
|
|
145
153
|
</v-list-item-title>
|
|
146
154
|
</v-list-item>
|
|
147
|
-
<v-list-item
|
|
155
|
+
<v-list-item
|
|
156
|
+
@click="editWorkOrder(selectedWorkOrder)"
|
|
157
|
+
v-if="canUpdateWorkOrder"
|
|
158
|
+
>
|
|
148
159
|
<v-list-item-title class="text-subtitle-2">
|
|
149
160
|
Edit
|
|
150
161
|
</v-list-item-title>
|
|
@@ -224,7 +235,7 @@ const message = ref("");
|
|
|
224
235
|
const messageColor = ref("");
|
|
225
236
|
const messageSnackbar = ref(false);
|
|
226
237
|
|
|
227
|
-
const { getColorStatus, formatDate } = useUtils();
|
|
238
|
+
const { getColorStatus, formatDate, debounce } = useUtils();
|
|
228
239
|
|
|
229
240
|
const _workOrder = ref<TWorkOrderCreate>({
|
|
230
241
|
attachments: [],
|
|
@@ -283,6 +294,7 @@ const {
|
|
|
283
294
|
page: page.value,
|
|
284
295
|
site: route.params.site as string,
|
|
285
296
|
category: props.category,
|
|
297
|
+
search: searchText.value || "",
|
|
286
298
|
})
|
|
287
299
|
);
|
|
288
300
|
|
|
@@ -486,4 +498,13 @@ function tableRowClickHandler(_: any, data: any) {
|
|
|
486
498
|
const dialogPreview = ref(false);
|
|
487
499
|
const selectedWorkOrder = ref<TWorkOrder | null>(null);
|
|
488
500
|
const searchText = ref("");
|
|
501
|
+
|
|
502
|
+
const debounceSearch = debounce(getAllReqRefresh, 500);
|
|
503
|
+
|
|
504
|
+
watch(
|
|
505
|
+
() => searchText.value,
|
|
506
|
+
() => {
|
|
507
|
+
debounceSearch();
|
|
508
|
+
}
|
|
509
|
+
);
|
|
489
510
|
</script>
|