From 03df7542cd456dc3e63a33cdd1f4cced5364f867 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 27 二月 2024 13:27:17 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/user/index.jsx | 182 ++++++++++++++++++++-------------------------
1 files changed, 82 insertions(+), 100 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index 2066b4e..0f89bb7 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -161,14 +161,13 @@
title: 'No',
dataIndex: 'index',
valueType: 'indexBorder',
- width: 30,
+ width: 48,
},
{
title: '閮ㄩ棬',
dataIndex: 'deptId$',
valueType: 'text',
hidden: false,
- width: 100,
render: (_, record) => {
if (_ && _ !== '-') {
return <Tag color={""}>{_}</Tag>
@@ -190,7 +189,6 @@
valueType: 'text',
hidden: false,
copyable: true,
- width: 100,
filterDropdown: (props) => <TextFilter
name='username'
{...props}
@@ -206,7 +204,6 @@
dataIndex: 'nickname',
valueType: 'text',
hidden: false,
- width: 100,
filterDropdown: (props) => <TextFilter
name='nickname'
{...props}
@@ -222,7 +219,6 @@
dataIndex: 'password',
valueType: 'password',
hidden: false,
- width: 100,
filterDropdown: (props) => <TextFilter
name='password'
{...props}
@@ -235,7 +231,6 @@
dataIndex: 'avatar',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <TextFilter
name='avatar'
{...props}
@@ -248,7 +243,6 @@
dataIndex: 'code',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <TextFilter
name='code'
{...props}
@@ -261,7 +255,6 @@
dataIndex: 'sex$',
valueType: 'text',
hidden: false,
- width: 80,
filterDropdown: (props) => <SelectFilter
name='sex'
{...props}
@@ -279,7 +272,6 @@
dataIndex: 'phone',
valueType: 'text',
hidden: false,
- width: 100,
filterDropdown: (props) => <TextFilter
name='phone'
{...props}
@@ -292,7 +284,6 @@
dataIndex: 'email',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <TextFilter
name='email'
{...props}
@@ -305,7 +296,6 @@
dataIndex: 'emailVerified$',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <SelectFilter
name='emailVerified'
{...props}
@@ -337,7 +327,6 @@
dataIndex: 'realName',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <TextFilter
name='realName'
{...props}
@@ -350,7 +339,6 @@
dataIndex: 'idCard',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <TextFilter
name='idCard'
{...props}
@@ -363,7 +351,6 @@
dataIndex: 'birthday',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <TextFilter
name='birthday'
{...props}
@@ -376,7 +363,6 @@
dataIndex: 'introduction',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <TextFilter
name='introduction'
{...props}
@@ -389,7 +375,6 @@
dataIndex: 'status$',
valueType: 'text',
hidden: false,
- width: 80,
render: (_, record) => {
const status = statusMap[record.status]
return <Tag color={status.color}>{status.text}</Tag>
@@ -410,7 +395,6 @@
dataIndex: 'createTime$',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <DatetimeRangeFilter
name='createTime'
{...props}
@@ -423,7 +407,6 @@
dataIndex: 'updateTime$',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <DatetimeRangeFilter
name='updateTime'
{...props}
@@ -436,7 +419,6 @@
dataIndex: 'updateBy$',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <LinkFilter
name='updateBy'
major='user'
@@ -450,7 +432,6 @@
dataIndex: 'memo',
valueType: 'text',
hidden: false,
- width: 140,
filterDropdown: (props) => <TextFilter
name='memo'
{...props}
@@ -462,8 +443,8 @@
{
title: '鎿嶄綔',
dataIndex: 'option',
- width: 120,
valueType: 'option',
+ width : 180,
render: (_, record) => [
<Button
type="link"
@@ -579,9 +560,9 @@
columns={columns}
cardBordered
size='small'
- scroll={{ y: boxHeight }}
+ // scroll={{ y: boxHeight }}
dateFormatter="string"
- pagination={{ pageSize: 20 }}
+ pagination={{ pageSize: 12 }}
search={false}
toolbar={{
search: {
@@ -686,84 +667,85 @@
}}
/>
</Col>
-
- <Edit
- open={modalVisible}
- values={currentRow || {}}
- treeData={deptTreeData}
- onCancel={
- () => {
- setModalVisible(false);
- setCurrentRow(undefined);
- }
- }
- onSubmit={async (values) => {
- let ok = false;
- if (values.id) {
- ok = await handleUpdate({ ...values })
- } else {
- ok = await handleSave({ ...values })
- }
- if (ok) {
- setModalVisible(false);
- setCurrentRow(undefined);
- if (actionRef.current) {
- actionRef.current.reload();
- }
- }
- }
- }
- />
-
- <Pwd
- open={pwdModalVisible}
- values={currentRow || {}}
- onCancel={
- () => {
- setPwdModalVisible(false);
- setCurrentRow(undefined);
- }
- }
- onSubmit={async (values) => {
- let ok = false;
- if (values.id) {
- ok = await handlePwd({ ...values })
- }
- if (ok) {
- setPwdModalVisible(false);
- setCurrentRow(undefined);
- if (actionRef.current) {
- actionRef.current.reload();
- }
- }
- }
- }
- />
-
- <AssignRole
- open={assignModalVisible}
- values={currentRow || {}}
- onCancel={
- () => {
- setAssignModalVisible(false);
- setCurrentRow(undefined);
- }
- }
- onSubmit={async (values) => {
- let ok = false;
- if (values.id) {
- ok = await handleUpdate({ ...values })
- }
- if (ok) {
- setAssignModalVisible(false);
- setCurrentRow(undefined);
- if (actionRef.current) {
- actionRef.current.reload();
- }
- }
- }}
- />
</Row>
+
+ <Edit
+ open={modalVisible}
+ values={currentRow || {}}
+ treeData={deptTreeData}
+ onCancel={
+ () => {
+ setModalVisible(false);
+ setCurrentRow(undefined);
+ }
+ }
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handleUpdate({ ...values })
+ } else {
+ ok = await handleSave({ ...values })
+ }
+ if (ok) {
+ setModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }
+ }
+ />
+
+ <Pwd
+ open={pwdModalVisible}
+ values={currentRow || {}}
+ onCancel={
+ () => {
+ setPwdModalVisible(false);
+ setCurrentRow(undefined);
+ }
+ }
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handlePwd({ ...values })
+ }
+ if (ok) {
+ setPwdModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }
+ }
+ />
+
+ <AssignRole
+ open={assignModalVisible}
+ values={currentRow || {}}
+ onCancel={
+ () => {
+ setAssignModalVisible(false);
+ setCurrentRow(undefined);
+ }
+ }
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handleUpdate({ ...values })
+ }
+ if (ok) {
+ setAssignModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }}
+ />
+
</PageContainer>
);
};
--
Gitblit v1.9.1