This commit is contained in:
2021-10-05 23:00:29 +00:00
parent 5e3fe7ceb1
commit 2de16f8fca

View File

@@ -97,10 +97,6 @@
> >
<template v-slot:event="{ event, eventSummary }"> <template v-slot:event="{ event, eventSummary }">
<div class="v-event-draggable"> <div class="v-event-draggable">
<!-- <v-icon small :color="event.textColor" class="mr-1">{{
iconForEvent(event.type)
}}</v-icon> -->
<span <span
:class="event.textColor + '--text'" :class="event.textColor + '--text'"
v-html="eventSummary()" v-html="eventSummary()"
@@ -134,13 +130,14 @@
@click="newItem($ay.ayt().WorkOrderItemScheduledUser)" @click="newItem($ay.ayt().WorkOrderItemScheduledUser)"
><v-icon large left>$ayiTools</v-icon ><v-icon large left>$ayiTools</v-icon
>{{ $ay.t("WorkOrder") }}</v-btn >{{ $ay.t("WorkOrder") }}</v-btn
> </v-col >
><v-col cols="12"> </v-col>
<!-- <v-col cols="12">
<v-btn x-large block @click="newItem($ay.ayt().Reminder)" <v-btn x-large block @click="newItem($ay.ayt().Reminder)"
><v-icon large left>$ayiStickyNote</v-icon ><v-icon large left>$ayiStickyNote</v-icon
>{{ $ay.t("Reminder") }}</v-btn >{{ $ay.t("Reminder") }}</v-btn
> >
</v-col> </v-col> -->
</v-card-text> </v-card-text>
<v-card-actions> <v-card-actions>
<v-btn text @click="cancelAddNew" color="primary">{{ <v-btn text @click="cancelAddNew" color="primary">{{
@@ -419,6 +416,13 @@ export default {
); );
switch (atype) { switch (atype) {
case this.$ay.ayt().WorkOrderItemScheduledUser: case this.$ay.ayt().WorkOrderItemScheduledUser:
{
let userId = null;
let userName = null;
if (newEvent.fullcat) {
userId = newEvent.fullcat.id;
userName = newEvent.fullcat.name;
}
this.$router.push({ this.$router.push({
name: "workorder-edit", name: "workorder-edit",
params: { params: {
@@ -427,11 +431,12 @@ export default {
type: atype, type: atype,
start: addStart, start: addStart,
end: addEnd, end: addEnd,
userId: this.$store.state.userId, userId: userId,
name: this.$store.state.userName name: userName
} }
} }
}); });
}
break; break;
case this.$ay.ayt().Reminder: case this.$ay.ayt().Reminder:
this.$router.push({ this.$router.push({
@@ -587,6 +592,7 @@ export default {
if (!this.dragEvent && !this.extendEvent) { if (!this.dragEvent && !this.extendEvent) {
return; return;
} }
const mouse = this.toTime(tms); const mouse = this.toTime(tms);
if (this.dragEvent && this.dragTime !== null) { if (this.dragEvent && this.dragTime !== null) {
//# DRAGGING PATH //# DRAGGING PATH
@@ -652,7 +658,9 @@ export default {
timed: true, timed: true,
type: 0, type: 0,
id: 0, id: 0,
editable: true editable: true,
fullcat: tms.category,
category: tms.category.name
}; };
this.events.push(this.extendEvent); this.events.push(this.extendEvent);
} }