From f1a6debdb0858745080a3cab43fb182d4c004a85 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 5 Mar 2019 01:09:28 +0000 Subject: [PATCH] --- .../src/components/gzdateandtimepicker.vue | 61 +++++++++++++++++++ ayanova/src/main.js | 2 + ayanova/src/views/inventory-widget-edit.vue | 10 +-- 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 ayanova/src/components/gzdateandtimepicker.vue diff --git a/ayanova/src/components/gzdateandtimepicker.vue b/ayanova/src/components/gzdateandtimepicker.vue new file mode 100644 index 00000000..c4bdcc1c --- /dev/null +++ b/ayanova/src/components/gzdateandtimepicker.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/ayanova/src/main.js b/ayanova/src/main.js index db8dfcb5..7f712eab 100644 --- a/ayanova/src/main.js +++ b/ayanova/src/main.js @@ -13,6 +13,7 @@ import "nprogress/nprogress.css"; import dayjs from "dayjs"; import gzdatepicker from "./components/gzdatepicker.vue"; import gztimepicker from "./components/gztimepicker.vue"; +import gzdateandtimepicker from "./components/gzdateandtimepicker.vue"; ///////////////////////////////////////////////////////////////// // FORM VALIDATION @@ -108,6 +109,7 @@ Vue.filter("boolastext", function(value) { // Vue.component("gz-date-picker", gzdatepicker); Vue.component("gz-time-picker", gztimepicker); +Vue.component("gz-date-time-picker", gzdateandtimepicker); ///////////////////////////////////////////////////////////////// // INSTANTIATE diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index d6e23d0c..b2da19ff 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -70,6 +70,11 @@ required > + + +
{{obj.startDate}}
+ +
@@ -99,8 +104,7 @@ export default { components: {}, data() { return { - obj: { - }, + obj: {}, lc: locale }; }, @@ -110,11 +114,9 @@ export default { // // if (!value) return ""; // // var dj = dayjs(value); // // return dj.format("YYYY-MM-DD hh:mm:ss A"); - // return this.obj.startDate // ? dayjs(this.obj.startDate).format("YYYY-MM-DD hh:mm:ss A") // : ""; - // //return this.obj.startDate ? moment(this.date).format("dddd, MMMM Do YYYY") : ""; // } },