diff --git a/src/views/biz-purchase.vue b/src/views/biz-purchase.vue index 0dbf0cd..906ed64 100644 --- a/src/views/biz-purchase.vue +++ b/src/views/biz-purchase.vue @@ -249,7 +249,6 @@ export default { notes: null, renewNoticeSent: false, quantity: 1, - vendorData: null, processedDate: null, wiki: null, tags: [] @@ -549,36 +548,7 @@ async function clickHandler(menuItem) { window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm); } break; - case "WorkOrderList": - m.vm.$router.push({ - name: "svc-workorders", - params: { - aType: m.vm.sockType, - objectId: m.vm.obj.id, - name: m.vm.obj.name - } - }); - break; - case "QuoteList": - m.vm.$router.push({ - name: "svc-quotes", - params: { - aType: m.vm.sockType, - objectId: m.vm.obj.id, - name: m.vm.obj.name - } - }); - break; - case "PMList": - m.vm.$router.push({ - name: "svc-pms", - params: { - aType: m.vm.sockType, - objectId: m.vm.obj.id, - name: m.vm.obj.name - } - }); - break; + default: window.$gz.eventBus.$emit( "notify-warning", @@ -662,27 +632,6 @@ function generateMenu(vm) { } menuOptions.menuItems.push({ divider: true, inset: false }); - // menuOptions.menuItems.push({ - // title: "WorkOrderList", - // icon: "$sockiTools", - // key: FORM_KEY + ":WorkOrderList", - // vm: vm - // }); - - // menuOptions.menuItems.push({ - // title: "QuoteList", - // icon: "$sockiPencilAlt", - // key: FORM_KEY + ":QuoteList", - // vm: vm - // }); - - // menuOptions.menuItems.push({ - // title: "PMList", - // icon: "$sockiBusinessTime", - // key: FORM_KEY + ":PMList", - // vm: vm - // }); - menuOptions.menuItems.push({ divider: true, inset: false }); window.$gz.eventBus.$emit("menu-change", menuOptions); } diff --git a/src/views/biz-vendor-notification.vue b/src/views/biz-vendor-notification.vue index b801cd3..67355ef 100644 --- a/src/views/biz-vendor-notification.vue +++ b/src/views/biz-vendor-notification.vue @@ -5,50 +5,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + data-cy="processed" + @input="fieldValueChanged('processed')" + > - + - - - - - - - - - - - - - - - @@ -234,25 +72,13 @@ const FORM_CUSTOM_TEMPLATE_KEY = "VendorNotification"; export default { data() { return { - formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY, obj: { id: 0, concurrency: 0, - customerId: 0, vendorId: 1, - productId: null, - salesOrderNumber: null, - purchaseDate: window.$gz.locale.nowUTC8601String(), - expireDate: null, - cancelDate: null, - couponCode: null, - notes: null, - renewNoticeSent: false, - quantity: 1, - vendorData: null, - processedDate: null, - wiki: null, - tags: [] + created: window.$gz.locale.nowUTC8601String(), + processed: null, + vendorData: null }, formState: { ready: false, @@ -549,36 +375,7 @@ async function clickHandler(menuItem) { window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm); } break; - case "WorkOrderList": - m.vm.$router.push({ - name: "svc-workorders", - params: { - aType: m.vm.sockType, - objectId: m.vm.obj.id, - name: m.vm.obj.name - } - }); - break; - case "QuoteList": - m.vm.$router.push({ - name: "svc-quotes", - params: { - aType: m.vm.sockType, - objectId: m.vm.obj.id, - name: m.vm.obj.name - } - }); - break; - case "PMList": - m.vm.$router.push({ - name: "svc-pms", - params: { - aType: m.vm.sockType, - objectId: m.vm.obj.id, - name: m.vm.obj.name - } - }); - break; + default: window.$gz.eventBus.$emit( "notify-warning", @@ -600,7 +397,6 @@ function generateMenu(vm) { formData: { sockType: window.$gz.type.VendorNotification, recordId: vm.$route.params.recordid, - formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY, recordName: vm.obj.name }, menuItems: [] @@ -662,27 +458,6 @@ function generateMenu(vm) { } menuOptions.menuItems.push({ divider: true, inset: false }); - // menuOptions.menuItems.push({ - // title: "WorkOrderList", - // icon: "$sockiTools", - // key: FORM_KEY + ":WorkOrderList", - // vm: vm - // }); - - // menuOptions.menuItems.push({ - // title: "QuoteList", - // icon: "$sockiPencilAlt", - // key: FORM_KEY + ":QuoteList", - // vm: vm - // }); - - // menuOptions.menuItems.push({ - // title: "PMList", - // icon: "$sockiBusinessTime", - // key: FORM_KEY + ":PMList", - // vm: vm - // }); - menuOptions.menuItems.push({ divider: true, inset: false }); window.$gz.eventBus.$emit("menu-change", menuOptions); } @@ -694,7 +469,6 @@ let JUST_DELETED = false; // async function initForm(vm) { await fetchTranslatedText(); - await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm); } ////////////////////////////////////////////////////////// @@ -704,21 +478,10 @@ async function initForm(vm) { async function fetchTranslatedText() { await window.$gz.translation.cacheTranslations([ "VendorNotification", - "PurchaseSalesOrderNumber", + "VendorNotificationCreated", "Vendor", - "Customer", - "Product", - "PurchaseSalesOrderNumber", - "PurchaseDate", - "PurchasePurchaseOverseerID", - "PurchaseExpireDate", - "PurchaseCancelDate", - "PurchaseCouponCode", - "PurchaseNotes", - "PurchaseRenewNoticeSent", - "PurchaseQuantity", - "PurchaseProcessed", - "PurchaseVendorNotificationId" + "VendorNotificationVendorData", + "VendorNotificationProcessed" ]); }