From f9d1e9f5daea1296988f78911160fa39d48dc638 Mon Sep 17 00:00:00 2001
From: ZL <577725356@qq.com>
Date: Wed, 24 Apr 2024 00:09:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages.json | 46 ++++++
src/pages/ask-leave/create.vue | 14 +-
src/pages/ask-leave/detail.vue | 3 +-
src/pages/business/components/item.vue | 36 +++++
src/pages/business/create.vue | 174 +++++++++++++++++++++++
src/pages/business/detail.vue | 119 ++++++++++++++++
src/pages/business/list.vue | 58 ++++++++
src/pages/make-card/create.vue | 10 +-
src/pages/make-card/detail.vue | 3 +-
src/pages/mine/index.vue | 4 +-
src/pages/overtime/components/item.vue | 39 ++++++
src/pages/overtime/create.vue | 186 +++++++++++++++++++++++++
src/pages/overtime/detail.vue | 119 ++++++++++++++++
src/pages/overtime/list.vue | 58 ++++++++
14 files changed, 859 insertions(+), 10 deletions(-)
create mode 100644 src/pages/business/components/item.vue
create mode 100644 src/pages/business/create.vue
create mode 100644 src/pages/business/detail.vue
create mode 100644 src/pages/business/list.vue
create mode 100644 src/pages/overtime/components/item.vue
create mode 100644 src/pages/overtime/create.vue
create mode 100644 src/pages/overtime/detail.vue
create mode 100644 src/pages/overtime/list.vue
diff --git a/src/pages.json b/src/pages.json
index 18c0653..c34947e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -227,6 +227,52 @@
}
}
]
+ },
+ {
+ "root": "pages/business",
+ "pages": [
+ {
+ "path": "list",
+ "style": {
+ "navigationBarTitleText": "出差报备"
+ }
+ },
+ {
+ "path": "create",
+ "style": {
+ "navigationBarTitleText": "出差报备"
+ }
+ },
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "出差详情"
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/overtime",
+ "pages": [
+ {
+ "path": "list",
+ "style": {
+ "navigationBarTitleText": "加班报备"
+ }
+ },
+ {
+ "path": "create",
+ "style": {
+ "navigationBarTitleText": "加班报备"
+ }
+ },
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "加班详情"
+ }
+ }
+ ]
}
],
"globalStyle": {
diff --git a/src/pages/ask-leave/create.vue b/src/pages/ask-leave/create.vue
index 1b687c6..df5c4fb 100644
--- a/src/pages/ask-leave/create.vue
+++ b/src/pages/ask-leave/create.vue
@@ -50,12 +50,19 @@
-
+
@@ -73,7 +80,8 @@ const dateStartPicker = ref(null)
const dateEndPicker = ref(null)
const pickerRef = ref(null)
const modalRef = ref(null)
-// const value = ref(Number(new Date())
+const startValue = ref(Number(new Date()))
+const endValue = ref(Number(new Date()))
const id = ref(0)
const loading = ref(false)
const form = reactive({
@@ -131,6 +139,8 @@ onLoad(options => {
}
})
.then(res => {
+ startValue.value = res.start_at * 1000
+ endValue.value = res.end_at * 1000
form.start_at = timeFormat(res.start_at, "yyyy-mm-dd hh:MM:ss")
form.end_at = timeFormat(res.end_at, "yyyy-mm-dd hh:MM:ss")
form.reason = res.reason
diff --git a/src/pages/ask-leave/detail.vue b/src/pages/ask-leave/detail.vue
index 6cb4ac5..cbe9046 100644
--- a/src/pages/ask-leave/detail.vue
+++ b/src/pages/ask-leave/detail.vue
@@ -1,6 +1,6 @@
-
+
@@ -95,7 +95,6 @@ const onSubmit = async () => {
title: "删除成功",
icon: "none"
})
- formRef.value.resetFields()
uni.navigateBack()
} catch (error) {
console.log(error)
diff --git a/src/pages/business/components/item.vue b/src/pages/business/components/item.vue
new file mode 100644
index 0000000..84f106c
--- /dev/null
+++ b/src/pages/business/components/item.vue
@@ -0,0 +1,36 @@
+
+
+ 出差报备
+
+ 目的地:
+ {{ item.address }}
+
+
+ 出差事由:
+ {{ item.reason }}
+
+
+ 申请时间:
+ {{ timeFormat(item.created_at, "yyyy-mm-dd hh:MM:ss") }}
+
+ {{ statusFun(item.workflow_check.check_status, "workflow_check", "name") }}
+
+
+
diff --git a/src/pages/business/create.vue b/src/pages/business/create.vue
new file mode 100644
index 0000000..7c7a51a
--- /dev/null
+++ b/src/pages/business/create.vue
@@ -0,0 +1,174 @@
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/business/detail.vue b/src/pages/business/detail.vue
new file mode 100644
index 0000000..84769cd
--- /dev/null
+++ b/src/pages/business/detail.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+ 申请人
+ {{ detail.employee.name }}
+
+
+
+ 所属门店
+ {{ detail.store.title }}
+
+
+
+ 电话号码
+ {{ detail.employee.phone }}
+
+
+
+ 申请时间
+ {{ timeFormat(detail.created_at, "yyyy-mm-dd hh:MM") }}
+
+
+
+ 目的地
+ {{ detail.address }}
+
+
+ 出差开始时间
+ {{ timeFormat(detail.start_at, "yyyy-mm-dd hh:MM") }}
+
+
+ 出差结束时间
+ {{ timeFormat(detail.end_at, "yyyy-mm-dd hh:MM") }}
+
+
+
+ 出差原因
+ {{ detail.reason }}
+
+
+
+
+
+ 拒绝
+
+
+ 通过
+
+
+
+
+
+
+
+
diff --git a/src/pages/business/list.vue b/src/pages/business/list.vue
new file mode 100644
index 0000000..137d77e
--- /dev/null
+++ b/src/pages/business/list.vue
@@ -0,0 +1,58 @@
+
+
+
+
+ 申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/make-card/create.vue b/src/pages/make-card/create.vue
index 6158a6d..ae437ca 100644
--- a/src/pages/make-card/create.vue
+++ b/src/pages/make-card/create.vue
@@ -52,7 +52,13 @@
-
+
@@ -108,7 +114,7 @@ onLoad(options => {
}
})
.then(res => {
- value.value = res.date
+ value.value = res.date * 1000
form.date = timeFormat(res.date, "yyyy-mm-dd hh:MM")
form.reason = res.reason
form.isOutSide = res.sign_type == 1 ? false : true
diff --git a/src/pages/make-card/detail.vue b/src/pages/make-card/detail.vue
index e3fc00a..98c40a4 100644
--- a/src/pages/make-card/detail.vue
+++ b/src/pages/make-card/detail.vue
@@ -1,6 +1,6 @@
-
+
@@ -101,7 +101,6 @@ const onSubmit = async () => {
title: "删除成功",
icon: "none"
})
- formRef.value.resetFields()
uni.navigateBack()
} catch (error) {
console.log(error)
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 7664590..4252e64 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -77,12 +77,12 @@ const opList = [
{
icon: "setting-fill",
title: "出差报备",
- url: ""
+ url: "/pages/business/list"
},
{
icon: "server-man",
title: "加班报备",
- url: ""
+ url: "/pages/overtime/list"
},
{
icon: "camera",
diff --git a/src/pages/overtime/components/item.vue b/src/pages/overtime/components/item.vue
new file mode 100644
index 0000000..4a90414
--- /dev/null
+++ b/src/pages/overtime/components/item.vue
@@ -0,0 +1,39 @@
+
+
+ 加班报备
+
+ 加班日期:
+ {{ timeFormat(item.date, "yyyy-mm-dd") }}
+
+
+ 加班时间:
+ {{ timeFormat(item.start_at, "yyyy-mm-dd hh:MM").substring(10) }} -
+ {{ timeFormat(item.end_at, "yyyy-mm-dd hh:MM").substring(10) }}
+
+
+ 加班事由:
+ {{ item.reason }}
+
+ {{ statusFun(item.workflow_check.check_status, "workflow_check", "name") }}
+
+
+
diff --git a/src/pages/overtime/create.vue b/src/pages/overtime/create.vue
new file mode 100644
index 0000000..2abf80f
--- /dev/null
+++ b/src/pages/overtime/create.vue
@@ -0,0 +1,186 @@
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/overtime/detail.vue b/src/pages/overtime/detail.vue
new file mode 100644
index 0000000..55f5405
--- /dev/null
+++ b/src/pages/overtime/detail.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+ 申请人
+ {{ detail.employee.name }}
+
+
+
+ 所属门店
+ {{ detail.store.title }}
+
+
+
+ 电话号码
+ {{ detail.employee.phone }}
+
+
+
+ 申请时间
+ {{ timeFormat(detail.created_at, "yyyy-mm-dd hh:MM") }}
+
+
+
+ 加班日期
+ {{ timeFormat(detail.date, "yyyy-mm-dd") }}
+
+
+ 开始时间
+ {{ timeFormat(detail.start_at, "yyyy-mm-dd hh:MM").substring(10) }}
+
+
+ 结束时间
+ {{ timeFormat(detail.end_at, "yyyy-mm-dd hh:MM").substring(10) }}
+
+
+
+ 加班原因
+ {{ detail.reason }}
+
+
+
+
+
+ 拒绝
+
+
+ 通过
+
+
+
+
+
+
+
+
diff --git a/src/pages/overtime/list.vue b/src/pages/overtime/list.vue
new file mode 100644
index 0000000..b6efb44
--- /dev/null
+++ b/src/pages/overtime/list.vue
@@ -0,0 +1,58 @@
+
+
+
+
+ 申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From b02b0cb901771c53a39ebabbe6b8d02ac0965b21 Mon Sep 17 00:00:00 2001
From: ZL <577725356@qq.com>
Date: Wed, 24 Apr 2024 00:41:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages.json | 23 ++++
src/pages/contract/components/item.vue | 32 ++++++
src/pages/contract/create.vue | 153 +++++++++++++++++++++++++
src/pages/contract/detail.vue | 114 ++++++++++++++++++
src/pages/contract/list.vue | 66 +++++++++++
src/pages/mine/index.vue | 2 +-
6 files changed, 389 insertions(+), 1 deletion(-)
create mode 100644 src/pages/contract/components/item.vue
create mode 100644 src/pages/contract/create.vue
create mode 100644 src/pages/contract/detail.vue
create mode 100644 src/pages/contract/list.vue
diff --git a/src/pages.json b/src/pages.json
index c34947e..4d23f86 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -273,6 +273,29 @@
}
}
]
+ },
+ {
+ "root": "pages/contract",
+ "pages": [
+ {
+ "path": "list",
+ "style": {
+ "navigationBarTitleText": "加班报备"
+ }
+ },
+ {
+ "path": "create",
+ "style": {
+ "navigationBarTitleText": "加班报备"
+ }
+ },
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "加班详情"
+ }
+ }
+ ]
}
],
"globalStyle": {
diff --git a/src/pages/contract/components/item.vue b/src/pages/contract/components/item.vue
new file mode 100644
index 0000000..fcb3687
--- /dev/null
+++ b/src/pages/contract/components/item.vue
@@ -0,0 +1,32 @@
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ {{ statusFun(item.workflow_check.status, "workflow_check", "name") }}
+
+
+
diff --git a/src/pages/contract/create.vue b/src/pages/contract/create.vue
new file mode 100644
index 0000000..05705d5
--- /dev/null
+++ b/src/pages/contract/create.vue
@@ -0,0 +1,153 @@
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/contract/detail.vue b/src/pages/contract/detail.vue
new file mode 100644
index 0000000..e8cff63
--- /dev/null
+++ b/src/pages/contract/detail.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+ 上传人
+ {{ detail.employee.name }}
+
+
+
+
+
+ 电话号码
+ {{ detail.employee.phone }}
+
+
+
+ 上传时间
+ {{ timeFormat(detail.created_at, "yyyy-mm-dd hh:MM") }}
+
+
+
+ 合同名称
+ {{ detail.name }}
+
+
+ 合同内容
+
+
+
+
+
+
+
+
+
+
+ 拒绝
+
+
+ 通过
+
+
+
+
+
+
+
+
diff --git a/src/pages/contract/list.vue b/src/pages/contract/list.vue
new file mode 100644
index 0000000..ec2a80a
--- /dev/null
+++ b/src/pages/contract/list.vue
@@ -0,0 +1,66 @@
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 4252e64..ad259db 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -87,7 +87,7 @@ const opList = [
{
icon: "camera",
title: "合同管理",
- url: ""
+ url: "/pages/contract/list"
}
]
},