From 27e7f93ae1824fd2a96199e2bfea37afedacb6a4 Mon Sep 17 00:00:00 2001 From: ihzero Date: Mon, 29 Apr 2024 04:24:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/pages.json | 6 + src/pages/ask-leave/create.vue | 2 +- src/pages/audits/data.data.js | 6 +- src/pages/audits/detail.vue | 2 +- src/pages/business/create.vue | 17 +- src/pages/examination/detail.vue | 18 +- src/pages/expense-account/detail.vue | 51 +++-- src/pages/home/components/store-down.vue | 27 ++- src/pages/home/index.vue | 18 +- src/pages/login/index.vue | 12 +- src/pages/make-card/create.vue | 133 ++++++++---- src/pages/mine/index.vue | 24 ++- src/pages/overtime/create.vue | 14 +- src/pages/overtime/detail.vue | 61 ++++-- src/pages/overtime/list.vue | 4 +- src/pages/revert/index.vue | 39 +++- src/pages/statement/components/list0.vue | 63 +++++- src/pages/statement/components/list1.vue | 23 +- src/pages/statement/index.vue | 263 ++++++++++++++--------- src/pages/train-books/detail.vue | 26 ++- src/pages/user/index.vue | 24 ++- src/pages/userInfo/index.vue | 135 ++++++++++++ src/pages/work/create.vue | 52 ++--- src/static/images/1.jpg | Bin 0 -> 39977 bytes src/static/images/2.jpg | Bin 0 -> 43554 bytes src/static/images/3.jpg | Bin 0 -> 42012 bytes yarn.lock | 5 + 28 files changed, 739 insertions(+), 287 deletions(-) create mode 100644 src/pages/userInfo/index.vue create mode 100644 src/static/images/1.jpg create mode 100644 src/static/images/2.jpg create mode 100644 src/static/images/3.jpg diff --git a/package.json b/package.json index 0f869a3..e2ea714 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "@dcloudio/uni-mp-xhs": "3.0.0-3090920231225001", "@dcloudio/uni-quickapp-webview": "3.0.0-3090920231225001", "@qiun/ucharts": "^2.5.0-20230101", + "dayjs": "^1.11.11", "luch-request": "^3.1.1", "pinia": "2.0.33", "pinia-plugin-persistedstate": "^3.2.1", diff --git a/src/pages.json b/src/pages.json index 46e63cc..19ce1e5 100644 --- a/src/pages.json +++ b/src/pages.json @@ -62,6 +62,12 @@ "style": { "navigationBarTitleText": "考勤记录" } + }, + { + "path": "pages/userInfo/index", + "style": { + "navigationBarTitleText": "个人信息" + } } ], "subPackages": [ diff --git a/src/pages/ask-leave/create.vue b/src/pages/ask-leave/create.vue index e3d62cd..bfd3889 100644 --- a/src/pages/ask-leave/create.vue +++ b/src/pages/ask-leave/create.vue @@ -39,7 +39,7 @@ - + diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js index 32656a0..c14c963 100644 --- a/src/pages/audits/data.data.js +++ b/src/pages/audits/data.data.js @@ -221,15 +221,15 @@ export default { }, { title: '申请人', dataIndex: 'check.subject.employee.name', + }, { + title: '申请时间', + dataIndex: 'check.subject.created_format', }, { title: '所属门店', dataIndex: 'check.subject.store.title', }, { title: '电话号码', dataIndex: 'check.subject.employee.phone' - }, { - title: '申请时间', - dataIndex: 'check.subject.created_format', }, { title: '请假类型', dataIndex: 'check.subject.type.name', diff --git a/src/pages/audits/detail.vue b/src/pages/audits/detail.vue index 7d21f17..6b99a62 100644 --- a/src/pages/audits/detail.vue +++ b/src/pages/audits/detail.vue @@ -37,7 +37,7 @@ > - + diff --git a/src/pages/business/create.vue b/src/pages/business/create.vue index d12780f..fbe8d61 100644 --- a/src/pages/business/create.vue +++ b/src/pages/business/create.vue @@ -8,13 +8,13 @@ - + - + @@ -94,10 +94,11 @@ const confirmEndDatePicker = e => { form.end_at = timeFormat(e.value, "yyyy-mm-dd hh:MM:ss") } const rules = reactive({ - start_at: [{ required: true, message: "请选择时间" }], - end_at: [{ required: true, message: "请选择时间" }], - reason: [{ required: true, message: "请输入出差理由" }], - address: [{ required: true, message: "请输入目的地" }] + address: [{ required: true, message: "请输入目的地" }], + start_at: [{ required: true, message: "请选择出差开始时间" }], + end_at: [{ required: true, message: "请选择出差结束时间" }], + reason: [{ required: true, message: "请输入出差事由" }], + }) onLoad(options => { http diff --git a/src/pages/examination/detail.vue b/src/pages/examination/detail.vue index 02c18ac..34142a3 100644 --- a/src/pages/examination/detail.vue +++ b/src/pages/examination/detail.vue @@ -47,6 +47,14 @@ :label="op.text" :name="i" > + + {{ op.text }} + + @@ -63,6 +71,14 @@ :label="op.text" :name="i" > + + {{ op.text }} + + @@ -101,7 +117,7 @@ const loading = ref(false) const list = computed(() => { const content = info.value?.content ?? [] content.forEach((item) => { - if (item.score == 1) { + if (item.cate == 1) { item.answer = item.user_answer?.[0] ?? '' } else { item.answer = item.user_answer ?? [] diff --git a/src/pages/expense-account/detail.vue b/src/pages/expense-account/detail.vue index eb1f07c..4b92729 100644 --- a/src/pages/expense-account/detail.vue +++ b/src/pages/expense-account/detail.vue @@ -23,6 +23,14 @@ cancelText="取消" > + + \ No newline at end of file + +onBackPress((options) => { + if (options.from == 'backbutton') { + return true + } else if (options.from == 'navigateBack') { + return false + } +}) + diff --git a/src/pages/make-card/create.vue b/src/pages/make-card/create.vue index d90df17..2f7a6b8 100644 --- a/src/pages/make-card/create.vue +++ b/src/pages/make-card/create.vue @@ -1,12 +1,18 @@