From 57f425ecccebef80afd76290bd36ea80990c6c93 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 27 Dec 2022 00:19:02 +0000 Subject: [PATCH] --- client/src/api/open-object-handler.js | 7 ++++++ client/src/views/biz-gzcase-list.vue | 9 ++------ client/src/views/biz-gzcase.vue | 3 +-- client/src/views/biz-license-list.vue | 1 - client/src/views/biz-product-list.vue | 1 - client/src/views/biz-product.vue | 1 - client/src/views/biz-purchase-list.vue | 1 - client/src/views/biz-purchase.vue | 1 - .../views/biz-subscription-server-list.vue | 1 - client/src/views/biz-subscription-server.vue | 1 - client/src/views/biz-trial-request-list.vue | 23 ++++++++++--------- client/src/views/biz-vendor-list.vue | 1 - client/src/views/biz-vendor.vue | 1 - server/DataList/GZCaseDataList.cs | 12 +--------- 14 files changed, 23 insertions(+), 40 deletions(-) diff --git a/client/src/api/open-object-handler.js b/client/src/api/open-object-handler.js index e32e065..66c761c 100644 --- a/client/src/api/open-object-handler.js +++ b/client/src/api/open-object-handler.js @@ -242,6 +242,13 @@ export default { }); break; + case socktype.GZCase: + vm.$router.push({ + name: "gzcase-edit", + params: { recordid: tid.id } + }); + break; + default: window.$gz.eventBus.$emit( "notify-warning", diff --git a/client/src/views/biz-gzcase-list.vue b/client/src/views/biz-gzcase-list.vue index ef00f33..1e0b102 100644 --- a/client/src/views/biz-gzcase-list.vue +++ b/client/src/views/biz-gzcase-list.vue @@ -96,9 +96,7 @@ async function clickHandler(menuItem) { case "extensions": { const res = await m.vm.$refs.extensions.open( - m.vm.$refs.gzdatatable.getDataListSelection( - window.$gz.type.GZCase - ) + m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.GZCase) ); if (res && res.refresh == true) { m.vm.reload = !m.vm.reload; @@ -108,9 +106,7 @@ async function clickHandler(menuItem) { case "report": { const res = await m.vm.$refs.reportSelector.open( - m.vm.$refs.gzdatatable.getDataListSelection( - window.$gz.type.GZCase - ), + m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.GZCase), m.id ); if (res == null) { @@ -136,7 +132,6 @@ function generateMenu(vm) { isMain: true, icon: "$sockiCoffee", title: "GZCaseList", - helpUrl: "gzcases", menuItems: [], formData: { sockType: window.$gz.type.GZCase diff --git a/client/src/views/biz-gzcase.vue b/client/src/views/biz-gzcase.vue index 5ad32c1..d269ddd 100644 --- a/client/src/views/biz-gzcase.vue +++ b/client/src/views/biz-gzcase.vue @@ -25,7 +25,7 @@ v-model="obj.caseId" dense :readonly="formState.readOnly" - :label="$ay.t('GZCaseId')" + :label="$sock.t('GZCaseId')" data-cy="caseId" :rules="[ form().integerValid(this, 'caseId'), @@ -476,7 +476,6 @@ function generateMenu(vm) { readOnly: vm.formState.readOnly, icon: "$sockiCoffee", title: "GZCase", - helpUrl: "biz-gzcases", formData: { sockType: window.$gz.type.GZCase, recordId: vm.$route.params.recordid, diff --git a/client/src/views/biz-license-list.vue b/client/src/views/biz-license-list.vue index a7457b6..1b5cac1 100644 --- a/client/src/views/biz-license-list.vue +++ b/client/src/views/biz-license-list.vue @@ -136,7 +136,6 @@ function generateMenu(vm) { isMain: true, icon: "$sockiAddressCard", title: "CustomerList", - helpUrl: "customers", menuItems: [], formData: { sockType: window.$gz.type.Customer diff --git a/client/src/views/biz-product-list.vue b/client/src/views/biz-product-list.vue index c66ce7c..60fd95a 100644 --- a/client/src/views/biz-product-list.vue +++ b/client/src/views/biz-product-list.vue @@ -134,7 +134,6 @@ function generateMenu(vm) { isMain: true, icon: "$sockiBarCode", title: "ProductList", - helpUrl: "products", menuItems: [], formData: { sockType: window.$gz.type.Product diff --git a/client/src/views/biz-product.vue b/client/src/views/biz-product.vue index ab84d4d..3f2d53c 100644 --- a/client/src/views/biz-product.vue +++ b/client/src/views/biz-product.vue @@ -532,7 +532,6 @@ function generateMenu(vm) { readOnly: vm.formState.readOnly, icon: "$sockiBarCode", title: "Product", - helpUrl: "svc-products", formData: { sockType: window.$gz.type.Product, recordId: vm.$route.params.recordid, diff --git a/client/src/views/biz-purchase-list.vue b/client/src/views/biz-purchase-list.vue index 6a31e1f..0eb7da9 100644 --- a/client/src/views/biz-purchase-list.vue +++ b/client/src/views/biz-purchase-list.vue @@ -136,7 +136,6 @@ function generateMenu(vm) { isMain: true, icon: "$sockiAddressCard", title: "PurchaseList", - helpUrl: "purchases", menuItems: [], formData: { sockType: window.$gz.type.Purchase diff --git a/client/src/views/biz-purchase.vue b/client/src/views/biz-purchase.vue index 5a6c321..84933ad 100644 --- a/client/src/views/biz-purchase.vue +++ b/client/src/views/biz-purchase.vue @@ -600,7 +600,6 @@ function generateMenu(vm) { readOnly: vm.formState.readOnly, icon: "$sockiBarCode", title: "Purchase", - helpUrl: "svc-purchases", formData: { sockType: window.$gz.type.Purchase, recordId: vm.$route.params.recordid, diff --git a/client/src/views/biz-subscription-server-list.vue b/client/src/views/biz-subscription-server-list.vue index 2a0190a..b34c452 100644 --- a/client/src/views/biz-subscription-server-list.vue +++ b/client/src/views/biz-subscription-server-list.vue @@ -136,7 +136,6 @@ function generateMenu(vm) { isMain: true, icon: "$sockiCloud", title: "SubscriptionServerList", - helpUrl: "subscription-servers", menuItems: [], formData: { sockType: window.$gz.type.SubscriptionServer diff --git a/client/src/views/biz-subscription-server.vue b/client/src/views/biz-subscription-server.vue index 7df81ed..845ad9f 100644 --- a/client/src/views/biz-subscription-server.vue +++ b/client/src/views/biz-subscription-server.vue @@ -1301,7 +1301,6 @@ function generateMenu(vm) { readOnly: vm.formState.readOnly, icon: "$sockiCloud", title: "SubscriptionServer", - helpUrl: "svc-subscription-servers", formData: { sockType: window.$gz.type.SubscriptionServer, recordId: vm.$route.params.recordid, diff --git a/client/src/views/biz-trial-request-list.vue b/client/src/views/biz-trial-request-list.vue index a7457b6..3f566f4 100644 --- a/client/src/views/biz-trial-request-list.vue +++ b/client/src/views/biz-trial-request-list.vue @@ -9,8 +9,8 @@