From 09d341d3d72d9e48f8cab3578a14d7e8a0b8435e Mon Sep 17 00:00:00 2001 From: ZL <577725356@qq.com> Date: Tue, 23 Apr 2024 22:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=8D=A1=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 23 +++ src/pages/ask-leave/components/item.vue | 36 +++++ src/pages/ask-leave/create.vue | 179 ++++++++++++++++++++++++ src/pages/ask-leave/detail.vue | 120 ++++++++++++++++ src/pages/ask-leave/list.vue | 58 ++++++++ src/pages/make-card/components/item.vue | 2 +- src/pages/make-card/create.vue | 4 +- src/pages/make-card/detail.vue | 8 +- src/pages/mine/index.vue | 2 +- 9 files changed, 422 insertions(+), 10 deletions(-) create mode 100644 src/pages/ask-leave/components/item.vue create mode 100644 src/pages/ask-leave/create.vue create mode 100644 src/pages/ask-leave/detail.vue create mode 100644 src/pages/ask-leave/list.vue diff --git a/src/pages.json b/src/pages.json index d8e5604..3fe2429 100644 --- a/src/pages.json +++ b/src/pages.json @@ -198,6 +198,29 @@ } } ] + }, + { + "root": "pages/ask-leave", + "pages": [ + { + "path": "list", + "style": { + "navigationBarTitleText": "请假申请" + } + }, + { + "path": "create", + "style": { + "navigationBarTitleText": "请假申请" + } + }, + { + "path": "detail", + "style": { + "navigationBarTitleText": "请假详情" + } + } + ] } ], "globalStyle": { diff --git a/src/pages/ask-leave/components/item.vue b/src/pages/ask-leave/components/item.vue new file mode 100644 index 0000000..d0e70e9 --- /dev/null +++ b/src/pages/ask-leave/components/item.vue @@ -0,0 +1,36 @@ + + diff --git a/src/pages/ask-leave/create.vue b/src/pages/ask-leave/create.vue new file mode 100644 index 0000000..1b687c6 --- /dev/null +++ b/src/pages/ask-leave/create.vue @@ -0,0 +1,179 @@ + + diff --git a/src/pages/ask-leave/detail.vue b/src/pages/ask-leave/detail.vue new file mode 100644 index 0000000..6cb4ac5 --- /dev/null +++ b/src/pages/ask-leave/detail.vue @@ -0,0 +1,120 @@ + + diff --git a/src/pages/ask-leave/list.vue b/src/pages/ask-leave/list.vue new file mode 100644 index 0000000..1974bcb --- /dev/null +++ b/src/pages/ask-leave/list.vue @@ -0,0 +1,58 @@ + + diff --git a/src/pages/make-card/components/item.vue b/src/pages/make-card/components/item.vue index 813f023..da47585 100644 --- a/src/pages/make-card/components/item.vue +++ b/src/pages/make-card/components/item.vue @@ -30,7 +30,7 @@ const props = defineProps({ item: Object }) const valueFormat = computed(() => { - return timeFormat(props.item.date, "yyyy-MM-dd hh:mm") + return timeFormat(props.item.date, "yyyy-mm-dd hh:MM") }) const goPath = () => { uni.navigateTo({ diff --git a/src/pages/make-card/create.vue b/src/pages/make-card/create.vue index 0738bcc..69cce34 100644 --- a/src/pages/make-card/create.vue +++ b/src/pages/make-card/create.vue @@ -85,7 +85,7 @@ const openDatePicker = () => { datetimePicker.value.open() } const confirmDatePicker = e => { - form.date = timeFormat(e.value, "yyyy-MM-dd hh:mm") + form.date = timeFormat(e.value, "yyyy-mm-dd hh:MM") } const confirmPicker = e => { form.sign_time = e.value[0] @@ -108,7 +108,7 @@ onLoad(options => { } }) .then(res => { - form.date = timeFormat(res.date, "yyyy-MM-dd hh:mm") + form.date = timeFormat(res.date, "yyyy-mm-dd hh:MM") form.reason = res.reason form.isOutSide = res.sign_type == 1 ? false : true form.outside_remarks = res.outside_remarks diff --git a/src/pages/make-card/detail.vue b/src/pages/make-card/detail.vue index 6db9752..e3fc00a 100644 --- a/src/pages/make-card/detail.vue +++ b/src/pages/make-card/detail.vue @@ -23,16 +23,12 @@ 申请时间 - {{ timeFormat(detail.created_at, "yyyy-MM-dd hh:mm") }} + {{ timeFormat(detail.created_at, "yyyy-mm-dd hh:MM") }} 补卡时间 - {{ timeFormat(detail.date, "yyyy-MM-dd hh:mm") }} - - - 补卡类别 - {{ detail.sign_time == 1 ? "上班打卡" : "下班打卡" }} + {{ timeFormat(detail.date, "yyyy-mm-dd hh:MM") }} diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index 45484d7..d993a47 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -72,7 +72,7 @@ const opList = [ { icon: "car", title: "请假申请", - url: "" + url: "/pages/ask-leave/list" }, { icon: "setting-fill",