Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
A
admin-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
admin-ci-test
Commits
7e3d62e6
提交
7e3d62e6
authored
7月 29, 2023
作者:
龚洪江
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复:分类选中问题
上级
9d1f0943
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
62 行增加
和
22 行删除
+62
-22
commonType.ts
src/api/interface/commonType.ts
+1
-1
systemManageType.ts
src/api/interface/systemManageType.ts
+5
-0
systemManage.ts
src/api/modules/systemManage.ts
+4
-0
index.tsx
src/pages/categoryManage/categoryList/index.tsx
+12
-12
index.tsx
...yManage/companyDetail/components/addPeopleModal/index.tsx
+39
-9
index.tsx
src/pages/systemManage/companyManage/companyDetail/index.tsx
+1
-0
没有找到文件。
src/api/interface/commonType.ts
浏览文件 @
7e3d62e6
...
...
@@ -161,5 +161,5 @@ export type exchangeBannerInfo = InterFunction<Array<any>, NonNullable<unknown>>
//手机号筛选小程序用户
export
type
getUserAccountByPhoneNumType
=
InterFunction
<
{
phoneNum
:
string
},
{
id
:
number
;
nickName
:
string
;
userName
:
string
}
{
id
:
number
;
nickName
:
string
;
userName
:
string
;
phoneNum
:
string
;
uid
:
string
}[]
>
;
src/api/interface/systemManageType.ts
浏览文件 @
7e3d62e6
...
...
@@ -244,6 +244,11 @@ export type listCompanyMembersType = InterItemFunction<
userSex
:
number
;
}[]
>
;
//单位-成员绑定
export
type
bindingCompanyMemberType
=
InterFunction
<
{
companyInfoId
:
number
;
userAccountId
:
number
},
any
>
;
//账号权限-列表
export
type
listRoleInfoPageType
=
InterItemFunction
<
...
...
src/api/modules/systemManage.ts
浏览文件 @
7e3d62e6
import
{
bindingCompanyMemberType
,
deleteRoleInfoType
,
getCompanyInfoByIdType
,
getSecondDistrictInfo
,
...
...
@@ -70,6 +71,9 @@ export class SystemManageAPI {
//单位-成员列表
static
getListCompanyMembers
:
listCompanyMembersType
=
(
params
)
=>
axios
.
get
(
'/userapp/company/listCompanyMembers'
,
{
params
});
//单位-成员绑定
static
bindingCompanyMember
:
bindingCompanyMemberType
=
(
params
)
=>
axios
.
get
(
'/userapp/company/bindingCompanyMember'
,
{
params
});
//账号权限-列表
static
getListRoleInfoPage
:
listRoleInfoPageType
=
(
data
)
=>
...
...
src/pages/categoryManage/categoryList/index.tsx
浏览文件 @
7e3d62e6
...
...
@@ -22,9 +22,9 @@ type ColumnTypes = Exclude<EditableTableProps['columns'], undefined>;
type
categoryType
=
InterDataType
<
categoryListRespType
>
[
'list'
];
const
CategoryList
=
()
=>
{
const
[
categoryTableForm
]
=
Form
.
useForm
<
any
>
();
const
[
selectedRowKeys
,
setSelectedRowKeys
]
=
useState
<
React
.
Key
[]
>
([]);
//新增,编辑分类弹窗
const
[
addOrEditCategoryModalShow
,
setAddOrEditCategoryModalShow
]
=
useState
<
boolean
>
(
false
);
const
[
selectedRowKeys
,
setSelectedRowKeys
]
=
useState
<
React
.
Key
[]
>
([]);
const
[
currentCategory
,
setCurrentCategory
]
=
useState
<
categoryType
[
0
]
>
();
const
[
loading
,
setLoading
]
=
useState
<
boolean
>
(
false
);
// 编辑的行
...
...
@@ -181,15 +181,8 @@ const CategoryList = () => {
};
// 排序选择
const
onSelectChange
=
(
record
:
categoryType
[
0
])
=>
{
const
index
:
number
=
selectedRowKeys
.
findIndex
((
item
:
any
)
=>
item
===
record
.
id
);
if
(
index
!=
-
1
)
{
selectedRowKeys
.
splice
(
index
,
1
);
setSelectedRowKeys
([...
selectedRowKeys
]);
}
else
{
setSelectedRowKeys
([...
selectedRowKeys
,
record
.
id
]);
}
setSelectedRowKeys
([
record
.
id
]);
};
//新增、编辑分类弹窗
const
addOrEditCategoryModalShowClick
=
(
record
?:
categoryType
[
0
]
|
any
)
=>
{
if
(
record
&&
!
record
.
subDTOList
)
{
...
...
@@ -413,11 +406,18 @@ const CategoryList = () => {
<
Table
bordered
rowSelection=
{
{
selectedRowKeys
,
hideSelectAll
:
true
,
renderCell
:
(
_checked
:
boolean
,
record
:
categoryType
[
0
])
=>
{
selectedRowKeys
,
renderCell
:
(
checked
:
boolean
,
record
:
categoryType
[
0
])
=>
{
console
.
log
(
'选中-->'
,
checked
);
return
(
<>
{
record
.
subDTOList
?
<
Radio
onChange=
{
()
=>
onSelectChange
(
record
)
}
/>
:
''
}
</>
<>
{
record
.
subDTOList
?
(
<
Radio
onChange=
{
()
=>
onSelectChange
(
record
)
}
checked=
{
checked
}
/>
)
:
(
''
)
}
</>
);
},
}
}
...
...
src/pages/systemManage/companyManage/companyDetail/components/addPeopleModal/index.tsx
浏览文件 @
7e3d62e6
import
{
FC
}
from
'react'
;
import
{
Form
,
Modal
,
ModalProps
,
Select
}
from
'antd'
;
import
{
CommonAPI
}
from
'~/api'
;
import
{
FC
,
useState
}
from
'react'
;
import
{
Form
,
message
,
Modal
,
ModalProps
,
Select
}
from
'antd'
;
import
{
CommonAPI
,
SystemManageAPI
}
from
'~/api'
;
interface
selfProps
{
onOk
:
()
=>
void
;
companyInfoId
:
number
;
}
const
AddPeopleModal
:
FC
<
ModalProps
&
selfProps
>
=
({
open
,
onCancel
,
onOk
})
=>
{
const
AddPeopleModal
:
FC
<
ModalProps
&
selfProps
>
=
({
open
,
onCancel
,
onOk
,
companyInfoId
})
=>
{
const
[
form
]
=
Form
.
useForm
<
{
userAccountId
:
number
}
>
();
const
[
options
,
setOptions
]
=
useState
<
{
label
:
string
;
value
:
number
;
key
:
string
}[]
>
([]);
const
handleOk
=
()
=>
{
onOk
();
form
.
validateFields
().
then
((
values
)
=>
{
SystemManageAPI
.
bindingCompanyMember
({
...
values
,
companyInfoId
}).
then
(({
code
})
=>
{
if
(
code
===
'200'
)
{
message
.
success
(
'绑定成功'
);
onOk
();
}
});
});
};
//select 搜索
const
selectSearchEvent
=
(
value
:
string
)
=>
{
CommonAPI
.
getUserAccountByPhoneNum
({
phoneNum
:
value
}).
then
(({
result
})
=>
{});
CommonAPI
.
getUserAccountByPhoneNum
({
phoneNum
:
value
}).
then
(({
result
})
=>
{
const
list
=
(
result
||
[]).
map
((
v
)
=>
({
label
:
v
.
phoneNum
+
`(
${
v
.
uid
}
)`
,
value
:
v
.
id
,
key
:
value
,
}));
setOptions
(
list
);
});
};
return
(
<
Modal
open=
{
open
}
title=
'添加成员'
onOk=
{
handleOk
}
onCancel=
{
onCancel
}
>
<
Form
>
<
Form
.
Item
label=
'成员'
>
<
Select
placeholder=
'请输入成员手机号码'
showSearch
onSearch=
{
selectSearchEvent
}
></
Select
>
<
Form
form=
{
form
}
>
<
Form
.
Item
label=
'成员'
name=
'userAccountId'
rules=
{
[{
required
:
true
,
message
:
'请选择成员'
}]
}
>
<
Select
placeholder=
'请输入成员手机号码'
showSearch
onSearch=
{
selectSearchEvent
}
filterOption=
{
(
input
,
option
)
=>
(
option
?.
key
??
''
).
toLowerCase
().
includes
(
input
.
toLowerCase
())
}
options=
{
options
}
></
Select
>
</
Form
.
Item
>
</
Form
>
</
Modal
>
...
...
src/pages/systemManage/companyManage/companyDetail/index.tsx
浏览文件 @
7e3d62e6
...
...
@@ -138,6 +138,7 @@ const CompanyDetail = () => {
open=
{
addPeopleModalShow
}
onCancel=
{
addPeopleModalCancel
}
onOk=
{
addPeopleModalOk
}
companyInfoId=
{
companyId
}
/>
</
div
>
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论