From 22a93667b1f4d37e2424b6a9ccd3e1c9ab1602b9 Mon Sep 17 00:00:00 2001 From: wang_yp <357754663@qq.com> Date: Thu, 20 Mar 2025 00:28:33 +0800 Subject: [PATCH] fix(staff) --- git.sh | 2 -- src/pages/patrolBrigade/config.tsx | 17 +++++++---------- src/pages/poverPage/pv.less | 1 + 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/git.sh b/git.sh index 5100536..95ccca2 100644 --- a/git.sh +++ b/git.sh @@ -16,7 +16,6 @@ git push # ps -# 编辑用户 是否党员 没回显 # app 政治面貌没有展示 @@ -25,7 +24,6 @@ git push # 签到 个人中心 展示今日签到信息 -# 通讯录,实时搜索 # pc # 力量汇总,加一个新兴领域 网格员 diff --git a/src/pages/patrolBrigade/config.tsx b/src/pages/patrolBrigade/config.tsx index 3207f6f..2adc00e 100644 --- a/src/pages/patrolBrigade/config.tsx +++ b/src/pages/patrolBrigade/config.tsx @@ -1,14 +1,9 @@ import { FormType } from "@/components/form/interface"; import { UserDataType } from "@/model/userModel"; +import { getBirthDateAndGender } from "@/util/util"; import { ColumnsType } from "antd/lib/table"; export const defaultConfig = () => [ - // { - // type: FormType.fetchList, - // label: "用户名", - // name: "user_identity", - // value: [], - // rules: [{ required: true, message: "请输入用户名称!" }], - // }, + { type: FormType.input, label: "身份类别", @@ -40,9 +35,11 @@ export const columns: ColumnsType = [ }, { title: "性别", - dataIndex: "sex", - render: (sex) => {sex === 1 ? "男" : "女"}, - }, + width: 100, + render: (render) => ( + {getBirthDateAndGender(render.id_card)?.gender} + ), + }, { title: "身份证", dataIndex: "id_card", diff --git a/src/pages/poverPage/pv.less b/src/pages/poverPage/pv.less index 4d8b6c0..b259671 100644 --- a/src/pages/poverPage/pv.less +++ b/src/pages/poverPage/pv.less @@ -35,6 +35,7 @@ border-bottom-right-radius: 40px; border-top-right-radius: 0px; margin-right: 10px; + cursor: pointer; padding: 5px; > div { margin-left: 10px;