case 4052

2021-12-31 01:07:04 +00:00
parent 26d8db25fe
commit 760bc809ac
31 changed files with 339 additions and 350 deletions
--- a/ayanova/src/views/svc-task-group.vue
+++ b/ayanova/src/views/svc-task-group.vue
@@ -587,20 +587,6 @@ function generateMenu(vm) {
    });
  }

-  if (
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    !vm.formState.readOnly
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
  menuOptions.menuItems.push({
    title: "Report",
    icon: "$ayiFileAlt",
@@ -619,6 +605,20 @@ function generateMenu(vm) {
    });
  }

+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    !vm.formState.readOnly
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
  menuOptions.menuItems.push({ divider: true, inset: false });

  menuOptions.menuItems.push({