From cefbc4b3e4e91ec059636b726a0fd0c88070c866 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 22 Jul 2023 14:41:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=BA=E5=91=98=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/company.js | 12 +- pages/oaHome/oaHome.vue | 4 +- pages/oaManager/oaManager.vue | 5 +- static/icons/man.png | Bin 0 -> 1083 bytes static/icons/woman.png | Bin 0 -> 1049 bytes subpkg/personnel/personnel.vue | 92 +++--- subpkg/personnelDetails/personnelDetails.vue | 277 ++++++++++++++++++- 7 files changed, 342 insertions(+), 48 deletions(-) create mode 100644 static/icons/man.png create mode 100644 static/icons/woman.png diff --git a/api/company.js b/api/company.js index 49f306d..503f529 100644 --- a/api/company.js +++ b/api/company.js @@ -18,4 +18,14 @@ export const companyView = (data) => oahttp.get('/company/view', data) /** * 公司详情 */ -export const companyAreaManager = (data) => oahttp.get('/company/areaManager', data) \ No newline at end of file +export const companyAreaManager = (data) => oahttp.get('/company/areaManager', data) + +/** + * 人员列表 + */ +export const companyUser = (data) => oahttp.get('/company/users', data) + +/** + * 人员详情 + */ +export const companyUserDetail = (data) => oahttp.get('/company/user', data) \ No newline at end of file diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index ef8cce5..af5b6ae 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -105,9 +105,9 @@ - + 登录里海OA,开启线上便捷办公 - + diff --git a/pages/oaManager/oaManager.vue b/pages/oaManager/oaManager.vue index 057c7ee..a296b63 100644 --- a/pages/oaManager/oaManager.vue +++ b/pages/oaManager/oaManager.vue @@ -44,7 +44,7 @@ 所属片区 - {{item.area}} + {{item.city_name+item.area_name+item.street_name}} @@ -218,7 +218,7 @@ .item { width: 694rpx; - height: 201rpx; + // height: 201rpx; background: #FFFFFF; border-radius: 14rpx 14rpx 14rpx 14rpx; opacity: 1; @@ -270,6 +270,7 @@ display: flex; justify-content: left; align-items: center; + margin-top: 20rpx; .circle { width: 11rpx; diff --git a/static/icons/man.png b/static/icons/man.png new file mode 100644 index 0000000000000000000000000000000000000000..503eeba9f2b9f09c2b1900f8f4b97c46d6f4209a GIT binary patch literal 1083 zcmV-B1jPG^P)P000^Y1^@s6LVfqm00001b5ch_0Itp) z=>Px&^+`lQR7gv$mR)EaMHI*XXFp~(F*LQcezYJ76|7cF?j|Cwr8EzMedvQ=`(mNi zhk_Qwcnu=oKrdtw=kMYyRy2^~ft!vx3xXBr?T({@rC zCm~EB5SLW{wN>)j1`Nd4C%23e(RzT!17ECr;tl4c6wZfiY3G`fsYVHOFPQ=yha=3? zTkI9@RZ7&9kG2`4yNQggnf8nXgbM&31~3tfiM8mXN^%@yORe0ihY6QSW0AqnK8}1a`%Kz>m^$}n^pU$ni z%d!V%A+1N4b)^2vVv@_3@?@AkSSNumt)&3Uwyvkn0%&FMS4H1>I-B3kW-40-X?cya zD&k1(3VNN-mIF!S89B((J51E3bMH96l=q=r$IOd{Wq-g)d@(3E4=o2!UX$}mCkgZt z7^j1R+&c$xJ@qMwcIiYP8tQfYY9LJ=Va^tIpyO~N@MZlCPx7TJrjYl=GiV$-PNUU8 z(zR}0X+sK%1@0c|q`$Koc0I*uQT_QlYDP~{X$2sc4O=usjK_ZLrk~4@*p$LN`*wO^ zR6krV{DDlnCDQTsb3OK%43hKIxM_r5^hH3Y)4lf4&jdGx-cD31d z#QF4|yFLwP#oOQP)Kac`zkO6QV}0Ud|Civ{`dQb4)ad7Tj_SF?_mLszPT7svls0k=zanug9eJeXuEmcJh$Au>LyDZP8$*H_=1k3JwwOqh8BW7 z`ZCwa+OW?s#WSoUu;y=z1^LuMwzm{ub3WW>+4dPx&(@8`@R7gw3l}%_|RTRg6=gmwL(>y+!aBk>@?z5Qf9$vd;#=)1JtH!j(=V zBAb(8_|A;J1kVP+UJ=>ovW-MuXs~v0!IA*kuC5kT_X}JDOi4a}TXJ;tNWskgoHJ&V z2k#d%9!O;}+baRjXtJ%XDXFeL2DB)oQ!7{Y%Fxi19PR5%v`l?%HhsD5M%(yY`>o+N!@U88UtTAs1Y!Nt| zwDy+8f?ZtJm^A{23XLYx>fk5bpP}%KZ|#nyz>5aw1!^OBP;$onrBD^AKGcxOytfSS zVS!Z&FUhzu`tQ8x9eyTra2eo-1lAPbSz{&zY7`#!t=+X$__#5y^8(;;m$~bX-bnTN zhD_$=rN9-uoH2g_Rj587<3aE`B2OqB_pQBlDezop=Q{Pg&mALq;X+DsL2#Ff94Oum zHz&jJ+r=7WySny?>IUFQ%G#UU_`A9v6X*fHN?Cj7V&K`XuG>A;LkgmBpKtBQGk42+ z4?Zd0E!$I>%)q4>oNsHpBA-Z{0_uRHNo#KqH%Emw1XrFn5P7UHTv7B|a%AMGN(^#s zZS5oyhZQad{+<%Ksxb_IE!~O*gTB5*ZgTQ7U~Lh4Iu?(ws~a8;%bAQD^9ryPsCJqd z^w(MY^^E?aO{Cr3E5@T}hrp9X=REKm;M(T+u)javbLLE^c-}pp=WPUTEC!!b zk$sxae-uk3jwI9RbLITY!siBLjoBrzS>bKp+ARxzP;t%86{fqpS2Rb_HdQsHcOq^M znt?N@9xpwQqMfPH(J$vSn>X{ZAhCBN=cq Tn#Ui!00000NkvXXu0mjf&_DRD literal 0 HcmV?d00001 diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue index 924c707..424ab86 100644 --- a/subpkg/personnel/personnel.vue +++ b/subpkg/personnel/personnel.vue @@ -2,47 +2,52 @@ - - - - - 未签约 - - - - + + + + + + {{item.is_contract?'已签约':'未签约'}} - - - 人员名称 - 隶属乡镇公司名称 + + + - - - - 13546841564 + + + {{item.name}} + {{item.company}} - - - 通滩镇 + + + + {{item.phone}} + + + + {{item.city_name+item.area_name+item.street_name}} + - - - 小组服务团队:管理人 - - 身份证 - 驾驶证 - 银行卡 + + + {{role}} + + + + 身份证 + 驾驶证 + 银行卡 + + + + + - - - - - - + +