From 0c35f8742c1bfb061834570bc9d5d28454d2017d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Wed, 15 Jan 2025 20:03:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=88=90=E5=91=98=E5=8F=8A=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TopNavigation/TopNavigation.vue | 17 +- src/pages.json | 8 + src/pages/approval/components/Components.vue | 14 +- .../components/MemberOrDepartment.vue | 65 +++++ .../components/MemberOrDepartmentItem.vue | 56 ++++ .../components/SearchItem.vue | 35 +++ .../select-member-or-department.vue | 275 ++++++++++++++++++ src/static/images/icon_delete.png | Bin 0 -> 1493 bytes src/static/images/icon_file.png | Bin 0 -> 1205 bytes src/types/uni-pages.d.ts | 1 + 10 files changed, 468 insertions(+), 3 deletions(-) create mode 100644 src/pages/approval/components/MemberOrDepartment.vue create mode 100644 src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue create mode 100644 src/pages/select-member-or-department/components/SearchItem.vue create mode 100644 src/pages/select-member-or-department/select-member-or-department.vue create mode 100644 src/static/images/icon_delete.png create mode 100644 src/static/images/icon_file.png diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue index af1bfdd..aa9af26 100644 --- a/src/components/TopNavigation/TopNavigation.vue +++ b/src/components/TopNavigation/TopNavigation.vue @@ -31,6 +31,13 @@ {{ title }} + + {{ rightButtonText }} + @@ -59,16 +66,24 @@ backUrl: { type: String, default: '/static/images/icon_back.png' + }, + rightButtonText: { + type: [String, null], + default: null } }) - const emits = defineEmits(['back']) + const emits = defineEmits(['back', 'rightButton']) const back = () => { uni.navigateBack() emits('back') } + const rightButton = () => { + emits('rightButton') + } + onMounted(async () => { systemInfo.value = await $basic.getSystemInfo() }) diff --git a/src/pages.json b/src/pages.json index 5e5745b..9c1261e 100644 --- a/src/pages.json +++ b/src/pages.json @@ -239,6 +239,14 @@ }, "needLogin": false }, + { + "path": "pages/select-member-or-department/select-member-or-department", + "type": "page", + "style": { + "navigationStyle": "custom", + "disableScroll": true + } + }, { "path": "pages/workbench/workbench", "type": "page" diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue index 4f2a1c8..d331ce8 100644 --- a/src/pages/approval/components/Components.vue +++ b/src/pages/approval/components/Components.vue @@ -61,12 +61,21 @@ @change="changeDate" > - + + + + + @@ -78,6 +87,7 @@ import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue' import Images from '@/pages/approval/components/Images.vue' import Description from '@/pages/approval/components/Description.vue' + import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue' const columns = ref>([ { diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue new file mode 100644 index 0000000..5339c4c --- /dev/null +++ b/src/pages/approval/components/MemberOrDepartment.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue new file mode 100644 index 0000000..2b3c360 --- /dev/null +++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select-member-or-department/components/SearchItem.vue new file mode 100644 index 0000000..9a13733 --- /dev/null +++ b/src/pages/select-member-or-department/components/SearchItem.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue new file mode 100644 index 0000000..f3a80e6 --- /dev/null +++ b/src/pages/select-member-or-department/select-member-or-department.vue @@ -0,0 +1,275 @@ + +{ + style: { + navigationStyle: 'custom', + disableScroll: true + } +} + + + + + + diff --git a/src/static/images/icon_delete.png b/src/static/images/icon_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..10c193fd39f760e9eda2fbbad302136b9b4c82ba GIT binary patch literal 1493 zcmZ`(doFY=JSK*;C?u6MdA43ro}C(x_>EL-IcO(qJ%>`F zu&rn7F^;k%&y`oosJs$pY0D$*w14mZaqm6%-tT<(p6{M>lbjrFC?q8k08s2~t(_$i z{c2JKiElRdZkGfk!r8_ON;{RO0q`ky)|SV(9#!7mNSSH@>KdM;&ywVAm=Q@sWC z{S%hrM>USyIehEhzV=b;n|86=pZaUjF&^&GUQ@$SifX`~q)9ltYl)^zH9ElgIbLUn zjbvI*v>;+J4UzO!r$%CY{tME;5-%>Ti;c*Kdy01@T;udpH0m6^qoS4PWhy5s3{pzS z;_w)Ygt(@V$&u+HIb0_!WenrjS&MlF$rdfECz2{TWn%<1W2G@+Y;f2+Y~7XGkaF?% z6VAhdP%LV{lGls?=ZCfoH89BD+x+1z9=KsRAUEdYd`!;`W%*M(R=6Dvc^qRa_NA+< zv3=X#xF%ir?F_*f@3F_g?cPh30hfybBw^XxKV+NqZAuE~y2;SiP&e|l-#_4Id?unE z$*5Ls=$#3QoWen2kF25$;Ihv~ZUQe8Q_KM2f0L?1P~cghxKot3J3ZiUoU@^d;Chj< z!DcX)I-RuXG}I~kst)RgU48iL?8lA591yznZFoAgo1qL4^@pmSNqL*oIw5~@XC@U) ziBNs58r%J7-qZ7n>sQ&as8&K1mKJYMq?Os~Vgc<$5-0Xc50ZGzWPmDy1#TCGU4auQ zj8IWNp*$KKM?1%2KMPv8bHlroM=(w$3O9JGDt9Nx^?K`S^@Gl~Ee(&N7_hFY8yB3* zX_>|L@2y<;w4`*+%}&;~4tG|Xc3kIAEgweW{Z|Lv)fAKiS-wMG8r+EGhoDFX~J97w|9fJr-dMCi2XFEAWj8%t{$Sar<@~^dzo2V z#Ob``IZk%!B}H|BlAa)tATp=ppeA~4#ki6ze1TzM1cgYEA3*5qGPGHB#Wjb*Y=5%Ur;hFb_W}2aXO+M{eJFq`w$49 zY4wg$`s8_iGQ3vMI4{F4RkSXAzHb_amCz(|Y6+f;VK17XN5_v^NOoM^KXch5Fct(+ zQhf?Mdp_!>hcb{pm6r5I1-Dh!jx>6oAv;(r)ztW$j@Et8)mV!J16HAO9ws$DWS>6X z5Nf7*?dlV2eij=Wn9{WqP1#Qaxcw6W)u`V=_FSilS$I@#vSP#ddV~%6o&4Qul^Q+<(QY#dB136jJr!CC6Sbw4YN`c=EdC+5K3t>&LskLg#>?( z05ks`9Ru9h2tyLoY|`wafp9S^>j(%Pv?H$qQt_Gl! yOy+Gsvz!*l2(TJ!>3A4PxaltiqUDZ`qQ>7@h0p6x`KC*LD%c%xv@W&sivI^x=VxXB literal 0 HcmV?d00001 diff --git a/src/static/images/icon_file.png b/src/static/images/icon_file.png new file mode 100644 index 0000000000000000000000000000000000000000..5a8886b842e0730c225abb5596c8a0e2df2ca159 GIT binary patch literal 1205 zcmeAS@N?(olHy`uVBq!ia0vp^y+GW+!3HGF4!o)cQjEnx?oJHr&dI!FU|`Ajba4!+ zh;CIfk-rOFqcY3wQ`mco zA9b@daXxua(KgwENlJl3ox$Yci5Uzg1_FK$(lX?}9X_49RdMxDBW&W(VZVpghZ~y#hng-}{k=RgX4xs{Ic>`xdtW|2V~0=Yg2EjpwM@_FZ2R*mUuxcJ z^3{Yq{hI@(<00;t02WE zgKt)$^UFCE_wO?0@ZG<(`H?E`TZhB@cj+~p+&`(ye5xt4?@ME;&`ED=ChlC{n#nBX zH*?jDbGEs&8kUs^hfaQ5v2kbqPmQ@nO`jI4_#Zzcy>m_%fqKaFTX9>X!kCY z$-lYuRMVPX}yCo*CkK3j5)W&Dp{ohC-@mTJifB+g!YAwrjkjF zQp>lw#x=T$ESb!6!D6fKCoYpk3UgB$j;+j{7`{M|^`#2)NHKaf%dA5E@4piT-g3@7 z28`lk+*yUy4wsX(d*6GqojqJvAsJMacSrxWu*!tjtUK^y{p2}(%a8BTEsSE}UGD2S<+WUJRi>6*=CQ_x&3PK@-tPOt_G3|C z$)y-JX219cJsW!Z`gZ>jDimvaCOhwX;^cRi)HVquOM5?2lb%D!7)eJ_}#&3_x> z$B?1Le(!LR!)530skRKhPY+Z_@MTnGY}~}YV5Lk2|7k{Fe%-Kd3?@^V-zQowc)9TC jDY=GaMGtIszDsZ3b$`C!kBA?@a)`mx)z4*}Q$iB}w`U?2 literal 0 HcmV?d00001 diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 64d411e..63e6d56 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -29,6 +29,7 @@ interface NavigateToOptions { "/pages/mine/mine" | "/pages/notification/notification" | "/pages/reset-password/reset-password" | + "/pages/select-member-or-department/select-member-or-department" | "/pages/workbench/workbench" | "/pages/attendance/attendance-add-group/attendance-add-group" | "/pages/attendance/attendance-add-group/attendance-device" |