Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
A
admin
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
admin
Commits
4e866e97
提交
4e866e97
authored
6月 15, 2023
作者:
ZhangLingKun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
功能:宣传中心联调
上级
5d9f47a6
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
896 行增加
和
7 行删除
+896
-7
commonType.ts
src/api/interface/commonType.ts
+123
-1
common.ts
src/api/modules/common.ts
+62
-3
index.tsx
src/components/remarkChange/index.tsx
+76
-0
index.tsx
src/components/uploader/index.tsx
+1
-1
index.tsx
...pages/mallManage/courseManage/comp/addEditModal/index.tsx
+1
-1
index.tsx
src/pages/mallManage/courseManage/index.tsx
+0
-1
index.tsx
...resourceManage/materielManage/comp/addEditModal/index.tsx
+211
-0
index.tsx
...sourceManage/materielManage/comp/addModuleModal/index.tsx
+105
-0
index.tsx
src/pages/resourceManage/materielManage/detail/index.tsx
+0
-0
index.tsx
src/pages/resourceManage/materielManage/index.tsx
+258
-0
index.tsx
...es/systemManage/accountManage/comp/addEditModal/index.tsx
+2
-0
router.tsx
src/router/router.tsx
+35
-0
index.ts
src/store/index.ts
+2
-0
index.ts
src/store/module/page/index.ts
+20
-0
没有找到文件。
src/api/interface/commonType.ts
浏览文件 @
4e866e97
import
{
InterFunction
}
from
'~/api/interface'
;
import
{
InterFunction
,
InterListFunction
}
from
'~/api/interface'
;
// 用户登录
export
type
BackEndLoginType
=
InterFunction
<
{
accountNo
:
string
;
passWord
:
string
;
remember
?:
boolean
},
...
...
@@ -17,3 +17,125 @@ export type BackEndLoginType = InterFunction<
export
type
uploadOssType
=
InterFunction
<
any
,
{
filePath
:
string
}
>
;
// 断电上传
export
type
uploadOssBPType
=
InterFunction
<
any
,
any
>
;
// V1.0.1-宣传模块管理-分页
export
type
listModuleInfoPage
=
InterListFunction
<
{
keyword
?:
string
;
moduleCode
?:
string
;
moduleType
?:
number
;
port
?:
number
;
},
{
id
:
number
;
moduleName
:
string
;
moduleType
:
number
;
remark
:
string
;
deleted
:
number
;
moduleCode
:
string
;
createTime
:
string
;
}
>
;
// 修改宣传备注
export
type
updateModuleInfoRemark
=
InterFunction
<
{
id
:
number
;
remark
:
string
;
},
NonNullable
<
unknown
>
>
;
// V1.0.1-删除宣传模块
export
type
removeModuleInfo
=
InterFunction
<
{
id
:
number
},
NonNullable
<
unknown
>>
;
// V1.0.1-宣传模块-新增
export
type
insertModuleInfo
=
InterFunction
<
{
id
?:
number
;
moduleCode
:
string
;
moduleName
:
string
;
moduleType
:
number
;
remark
?:
string
;
},
NonNullable
<
unknown
>
>
;
// 宣传模块-修改
export
type
updateModuleInfo
=
InterFunction
<
{
id
:
number
;
moduleCode
:
string
;
moduleName
:
string
;
moduleType
:
number
;
remark
?:
string
;
},
NonNullable
<
unknown
>
>
;
// V1.0.1-banner管理-分页
export
type
listBannerInfoPage
=
InterListFunction
<
{
keyword
?:
string
;
moduleId
?:
number
;
moduleType
?:
number
;
},
{
bannerImg
:
string
;
bannerName
:
string
;
bannerPoster
:
string
;
bannerType
:
number
;
bannerUrl
:
string
;
createTime
:
string
;
deleted
:
number
;
detailInfo
:
string
;
endTime
:
string
;
goodsId
:
number
;
id
:
number
;
moduleId
:
number
;
sort
:
number
;
startTime
:
string
;
textContent
:
string
;
using
:
number
;
}
>
;
// // V1.0.1-banner-新增
export
type
insertBannerInfo
=
InterFunction
<
{
bannerImg
?:
string
;
bannerName
?:
string
;
bannerPoster
?:
string
;
bannerType
?:
number
;
bannerUrl
?:
string
;
detailInfo
?:
string
;
endTime
?:
string
;
goodsId
?:
number
;
id
?:
number
;
moduleId
?:
number
;
sort
?:
number
;
startTime
?:
string
;
textContent
?:
string
;
using
?:
number
;
},
NonNullable
<
unknown
>
>
;
// V1.0.1-banner-修改
export
type
updateBannerInfo
=
InterFunction
<
{
bannerImg
?:
string
;
bannerName
?:
string
;
bannerPoster
?:
string
;
bannerType
?:
number
;
bannerUrl
?:
string
;
detailInfo
?:
string
;
endTime
?:
string
;
goodsId
?:
number
;
id
?:
number
;
moduleId
?:
number
;
sort
?:
number
;
startTime
?:
string
;
textContent
?:
string
;
using
?:
number
;
},
NonNullable
<
unknown
>
>
;
// V1.0.1-banner批量删除
export
type
batchRemoveBannerInfo
=
InterFunction
<
any
,
NonNullable
<
unknown
>>
;
// V1.0.1-删除banner
export
type
removeBannerInfo
=
InterFunction
<
{
id
:
number
},
NonNullable
<
unknown
>>
;
// V1.0.1-banner-排序交换
export
type
exchangeBannerInfo
=
InterFunction
<
Array
<
any
>
,
NonNullable
<
unknown
>>
;
src/api/modules/common.ts
浏览文件 @
4e866e97
import
axios
from
'../request'
;
import
{
BackEndLoginType
,
uploadOssBPType
,
uploadOssType
}
from
'~/api/interface/commonType'
;
import
{
BackEndLoginType
,
batchRemoveBannerInfo
,
exchangeBannerInfo
,
insertBannerInfo
,
insertModuleInfo
,
listBannerInfoPage
,
listModuleInfoPage
,
removeBannerInfo
,
removeModuleInfo
,
updateBannerInfo
,
updateModuleInfo
,
updateModuleInfoRemark
,
uploadOssBPType
,
uploadOssType
,
}
from
'~/api/interface/commonType'
;
export
class
CommonAPI
{
// 用户登录
...
...
@@ -7,8 +22,52 @@ export class CommonAPI {
axios
.
post
(
'/userapp/auth/backEndLogin'
,
params
);
// 上传图片
static
uploadOss
:
uploadOssType
=
(
data
)
=>
axios
.
post
(
'/pms/upload/oss'
,
data
);
static
uploadOss
:
uploadOssType
=
(
params
)
=>
axios
.
post
(
'/pms/upload/oss'
,
params
);
// 断点上传
static
uploadOssBP
:
uploadOssBPType
=
(
data
)
=>
axios
.
post
(
'/pms/upload/breakpoint'
,
data
);
static
uploadOssBP
:
uploadOssBPType
=
(
params
)
=>
axios
.
post
(
'/pms/upload/breakpoint'
,
params
);
// V1.0.1-宣传模块管理-分页
static
listModuleInfoPage
:
listModuleInfoPage
=
(
params
)
=>
axios
.
post
(
'/release/module/listModuleInfoPage'
,
params
);
// 修改宣传备注
static
updateModuleInfoRemark
:
updateModuleInfoRemark
=
(
params
)
=>
axios
.
get
(
'/release/module/updateModuleInfoRemark'
,
{
params
});
// V1.0.1-删除宣传模块
static
removeModuleInfo
:
removeModuleInfo
=
(
params
)
=>
axios
.
get
(
'/release/module/removeModuleInfo'
,
{
params
});
// V1.0.1-宣传模块-新增
static
insertModuleInfo
:
insertModuleInfo
=
(
params
)
=>
axios
.
post
(
'/release/module/insertModuleInfo'
,
params
);
// 宣传模块-修改
static
updateModuleInfo
:
updateModuleInfo
=
(
params
)
=>
axios
.
post
(
'/release/module/updateModuleInfo'
,
params
);
// V1.0.1-banner管理-分页
static
listBannerInfoPage
:
listBannerInfoPage
=
(
params
)
=>
axios
.
post
(
'/release/module/listBannerInfoPage'
,
params
);
// V1.0.1-banner-新增
static
insertBannerInfo
:
insertBannerInfo
=
(
params
)
=>
axios
.
post
(
'/release/module/insertBannerInfo'
,
params
);
// V1.0.1-banner-修改
static
updateBannerInfo
:
updateBannerInfo
=
(
params
)
=>
axios
.
post
(
'/release/module/updateBannerInfo'
,
params
);
// V1.0.1-banner批量删除
static
batchRemoveBannerInfo
:
batchRemoveBannerInfo
=
(
params
)
=>
axios
.
post
(
'/release/module/batchRemoveBannerInfo'
,
params
);
// V1.0.1-删除banner
static
removeBannerInfo
:
removeBannerInfo
=
(
params
)
=>
axios
.
get
(
'/release/module/removeBannerInfo'
,
{
params
});
// V1.0.1-banner-排序交换
static
exchangeBannerInfo
:
exchangeBannerInfo
=
(
params
)
=>
axios
.
post
(
'/release/module/exchangeBannerInfo'
,
params
);
}
src/components/remarkChange/index.tsx
0 → 100644
浏览文件 @
4e866e97
import
React
,
{
useEffect
}
from
'react'
;
import
{
Form
,
Input
,
message
,
Modal
}
from
'antd'
;
// 传参类型
interface
propType
{
title
?:
string
;
open
:
boolean
;
closed
:
any
;
change
:
any
;
name
?:
string
;
data
:
any
;
}
const
RemarkChange
:
React
.
FC
<
propType
>
=
(
props
)
=>
{
RemarkChange
.
defaultProps
=
{
title
:
'修改备注'
,
name
:
'remark'
,
};
// 参数
const
{
title
,
open
,
closed
,
change
,
data
,
name
}
=
props
;
// 表单钩子
const
[
form
]
=
Form
.
useForm
<
{
remark
:
string
}
>
();
// 关闭弹窗
const
handleCancel
=
()
=>
{
form
.
resetFields
();
closed
();
};
// 确认事件
const
handleOk
=
()
=>
{
form
.
validateFields
()
.
then
(
async
(
values
)
=>
{
await
handleSubmit
(
values
);
})
.
catch
((
err
)
=>
{
message
.
warning
({
content
:
err
.
errorFields
[
0
].
errors
[
0
],
})
.
then
();
});
};
// 提交事件
const
handleSubmit
=
async
(
values
:
{
remark
:
string
})
=>
{
// console.log(values);
change
({
id
:
data
.
id
,
[
name
?
name
:
'remark'
]:
values
.
remark
,
});
};
// componentDidMount
useEffect
(()
=>
{
if
(
!
open
)
return
;
if
(
!
data
)
return
;
form
.
setFieldValue
(
'remark'
,
data
[
name
?
name
:
'remark'
]);
// console.log(data);
},
[
open
]);
return
(
<
Modal
open=
{
open
}
title=
{
title
}
onCancel=
{
handleCancel
}
onOk=
{
handleOk
}
destroyOnClose
width=
{
400
}
>
<
Form
name=
'addForm'
form=
{
form
}
labelAlign=
'right'
>
<
Form
.
Item
label=
'备注'
name=
'remark'
rules=
{
[{
required
:
true
,
message
:
'请输入备注'
}]
}
>
<
Input
.
TextArea
placeholder=
{
'请输入备注'
}
maxLength=
{
50
}
allowClear
showCount
rows=
{
4
}
/>
</
Form
.
Item
>
</
Form
>
</
Modal
>
);
};
export
default
RemarkChange
;
src/components/uploader/index.tsx
浏览文件 @
4e866e97
...
...
@@ -74,7 +74,7 @@ export const Uploader: React.FC<PropsType> = (props) => {
// @ts-ignore
//(val: { result: { filePath: string } }) => {
({
result
})
=>
{
console
.
log
(
result
);
//
console.log(result);
setFileList
([
...
fileList
,
{
...
...
src/pages/mallManage/courseManage/comp/addEditModal/index.tsx
浏览文件 @
4e866e97
...
...
@@ -183,7 +183,7 @@ const AddEditModal: React.FC<propType> = (props) => {
fileUpload
fileLength=
{
1
}
fileType=
{
[
'video/mp4'
,
'video/avi'
,
'video/wmv'
,
'video/rmvb'
]
}
fileSize=
{
1024
}
fileSize=
{
512
}
onChange=
{
(
e
)
=>
form
.
setFieldValue
(
'videoUrl'
,
e
[
0
].
url
)
}
defaultFileList=
{
data
?.
videoUrl
?
[{
url
:
data
?.
videoUrl
}]
:
[]
}
>
...
...
src/pages/mallManage/courseManage/index.tsx
浏览文件 @
4e866e97
...
...
@@ -233,7 +233,6 @@ const CourseManageView = () => {
onChange
:
(
page
:
number
,
pageSize
:
number
)
=>
paginationChange
(
page
,
pageSize
),
showTotal
:
(
total
,
range
)
=>
`当前 ${range[0]}-${range[1]} 条记录 / 共 ${total} 条数据`
,
}
}
// rowSelection={{ selectedRowKeys, onChange: onSelectChange }}
/>
<
AddEditModal
open=
{
isAddEditVisModal
}
...
...
src/pages/resourceManage/materielManage/comp/addEditModal/index.tsx
0 → 100644
浏览文件 @
4e866e97
import
React
,
{
useEffect
,
useState
}
from
'react'
;
import
{
Form
,
Input
,
message
,
Modal
,
Select
}
from
'antd'
;
import
{
InterListType
,
InterReqType
}
from
'~/api/interface'
;
import
{
insertBannerInfo
,
listBannerInfoPage
}
from
'~/api/interface/commonType'
;
import
{
CommonAPI
}
from
'~/api'
;
import
{
PlusOutlined
}
from
'@ant-design/icons'
;
import
{
Uploader
}
from
'~/components/uploader'
;
import
RichText
from
'~/components/richText'
;
// 列表的类型
type
TableType
=
InterListType
<
listBannerInfoPage
>
;
// 请求的表单类型
type
ReqType
=
InterReqType
<
insertBannerInfo
>
;
// 传参类型
interface
propType
{
title
:
string
;
open
:
boolean
;
closed
:
any
;
data
?:
TableType
[
0
];
moduleId
:
number
;
}
// 详情类型
const
bannerType
=
[
{
label
:
'无'
,
value
:
0
},
{
label
:
'海报'
,
value
:
1
},
{
label
:
'路由'
,
value
:
2
},
{
label
:
'路由(需要授权)'
,
value
:
9
},
{
label
:
'路由(跳转Tab栏)'
,
value
:
10
},
{
label
:
'小程序'
,
value
:
3
},
// { label: '弹窗', value: 4 },
{
label
:
'纯文本'
,
value
:
5
},
// { label: '服务SKU', value: 6 },
// { label: '红包', value: 7 },
// { label: '推文', value: 8 },
{
label
:
'富文本'
,
value
:
11
},
];
const
AddEditModal
:
React
.
FC
<
propType
>
=
(
props
)
=>
{
AddEditModal
.
defaultProps
=
{
data
:
undefined
,
};
// 参数
const
{
title
,
open
,
closed
,
data
,
moduleId
}
=
props
;
// 表单钩子
const
[
form
]
=
Form
.
useForm
<
ReqType
>
();
// 上传图片
const
[
bannerTypeValue
,
setBannerTypeValue
]
=
useState
(
0
);
// 关闭弹窗
const
handleCancel
=
()
=>
{
setBannerTypeValue
(
0
);
form
.
resetFields
();
closed
();
};
// 确认事件
const
handleOk
=
()
=>
{
form
.
validateFields
()
.
then
(
async
(
values
)
=>
{
await
handleSubmit
(
values
);
})
.
catch
((
err
)
=>
{
message
.
warning
({
content
:
err
.
errorFields
[
0
].
errors
[
0
],
})
.
then
();
});
};
// 提交事件
const
handleSubmit
=
async
(
values
:
ReqType
)
=>
{
const
res
=
await
CommonAPI
[
data
?.
id
?
'updateBannerInfo'
:
'insertBannerInfo'
]({
...
values
,
moduleId
,
id
:
data
?.
id
,
});
if
(
res
&&
res
.
code
===
'200'
)
{
message
.
success
(
'操作成功'
);
handleCancel
();
}
};
// componentDidMount
useEffect
(()
=>
{
if
(
!
open
)
return
;
if
(
!
data
)
return
;
form
.
setFieldsValue
(
data
);
setBannerTypeValue
(
data
?.
bannerType
);
// console.log('data --->', data);
},
[
open
]);
return
(
<
Modal
open=
{
open
}
title=
{
title
}
onCancel=
{
handleCancel
}
onOk=
{
handleOk
}
destroyOnClose
>
<
Form
name=
'Form'
form=
{
form
}
labelAlign=
'right'
labelCol=
{
{
span
:
4
}
}
wrapperCol=
{
{
span
:
10
}
}
>
<
Form
.
Item
label=
'名称'
name=
'bannerName'
rules=
{
[{
required
:
true
,
message
:
'请输入名称'
}]
}
>
<
Input
placeholder=
{
'请输入名称'
}
maxLength=
{
20
}
allowClear
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'状态'
name=
'using'
rules=
{
[{
required
:
true
,
message
:
'请选择状态'
}]
}
>
<
Select
placeholder=
{
'请选择状态'
}
options=
{
[
{
label
:
'上架'
,
value
:
1
},
{
label
:
'下架'
,
value
:
0
},
]
}
allowClear
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'封面图'
name=
'bannerImg'
rules=
{
[{
required
:
true
,
message
:
'请上传封面图'
}]
}
>
<
Uploader
listType=
{
'picture-card'
}
fileUpload
fileLength=
{
1
}
fileSize=
{
10
}
fileType=
{
[
'image/png'
,
'image/jpeg'
,
'image/jpg'
,
'image/gif'
,
'image/bmp'
]
}
onChange=
{
(
e
)
=>
form
.
setFieldValue
(
'bannerImg'
,
e
[
0
].
url
)
}
defaultFileList=
{
data
?.
bannerImg
?
[{
url
:
data
?.
bannerImg
}]
:
[]
}
>
<
PlusOutlined
/>
</
Uploader
>
</
Form
.
Item
>
<
Form
.
Item
label=
'详情类型'
name=
'bannerType'
rules=
{
[{
required
:
true
,
message
:
'请选择详情类型'
}]
}
// initialValue={0}
>
<
Select
placeholder=
{
'请选择详情类型'
}
options=
{
bannerType
}
allowClear
onChange=
{
setBannerTypeValue
}
value=
{
bannerTypeValue
}
/>
</
Form
.
Item
>
{
[
2
,
9
,
10
].
includes
(
bannerTypeValue
)
&&
(
<
Form
.
Item
label=
'路由地址'
name=
'bannerUrl'
rules=
{
[{
required
:
true
,
message
:
'请输入路由地址'
}]
}
>
<
Input
placeholder=
{
'请输入路由地址'
}
maxLength=
{
100
}
allowClear
/>
</
Form
.
Item
>
)
}
{
[
3
].
includes
(
bannerTypeValue
)
&&
(
<
Form
.
Item
label=
'小程序appid'
name=
'bannerUrl'
rules=
{
[{
required
:
true
,
message
:
'请输入小程序appid'
}]
}
>
<
Input
placeholder=
{
'请输入小程序appid'
}
maxLength=
{
100
}
allowClear
/>
</
Form
.
Item
>
)
}
{
[
5
].
includes
(
bannerTypeValue
)
&&
(
<
Form
.
Item
label=
'纯文本'
name=
'bannerUrl'
rules=
{
[{
required
:
true
,
message
:
'请输入纯文本'
}]
}
>
<
Input
placeholder=
{
'请输入纯文本'
}
maxLength=
{
100
}
allowClear
/>
</
Form
.
Item
>
)
}
{
[
11
].
includes
(
bannerTypeValue
)
&&
(
<
Form
.
Item
label=
'富文本'
name=
'textContent'
rules=
{
[{
required
:
true
,
message
:
'请输入富文本'
}]
}
wrapperCol=
{
{
span
:
20
}
}
>
<
RichText
value=
{
form
.
getFieldValue
(
'textContent'
)
}
onChange=
{
(
e
)
=>
form
.
setFieldValue
(
'textContent'
,
e
)
}
height=
{
250
}
/>
</
Form
.
Item
>
)
}
{
[
1
].
includes
(
bannerTypeValue
)
&&
(
<
Form
.
Item
label=
'详情海报'
name=
'bannerPoster'
rules=
{
[{
required
:
true
,
message
:
'请上传详情海报'
}]
}
>
<
Uploader
listType=
{
'picture-card'
}
fileUpload
fileLength=
{
1
}
fileSize=
{
10
}
fileType=
{
[
'image/png'
,
'image/jpeg'
,
'image/jpg'
,
'image/gif'
,
'image/bmp'
]
}
onChange=
{
(
e
)
=>
form
.
setFieldValue
(
'bannerPoster'
,
e
[
0
].
url
)
}
defaultFileList=
{
data
?.
bannerPoster
?
[{
url
:
data
?.
bannerPoster
}]
:
[]
}
>
<
PlusOutlined
/>
</
Uploader
>
</
Form
.
Item
>
)
}
</
Form
>
</
Modal
>
);
};
export
default
AddEditModal
;
src/pages/resourceManage/materielManage/comp/addModuleModal/index.tsx
0 → 100644
浏览文件 @
4e866e97
import
React
,
{
useEffect
}
from
'react'
;
import
{
Form
,
Input
,
message
,
Modal
,
Select
}
from
'antd'
;
import
{
InterListType
,
InterReqType
}
from
'~/api/interface'
;
import
{
insertModuleInfo
,
listModuleInfoPage
}
from
'~/api/interface/commonType'
;
import
{
CommonAPI
}
from
'~/api'
;
// 列表的类型
type
TableType
=
InterListType
<
listModuleInfoPage
>
;
// 请求的表单类型
type
ReqType
=
InterReqType
<
insertModuleInfo
>
;
// 传参类型
interface
propType
{
title
:
string
;
open
:
boolean
;
closed
:
any
;
data
?:
TableType
[
0
];
}
// 所属产品
const
moduleType
=
[
{
label
:
'云享飞'
,
value
:
0
},
{
label
:
'云飞手'
,
value
:
1
},
{
label
:
'云仓'
,
value
:
2
},
{
label
:
'无人机城'
,
value
:
3
},
];
const
AddModuleModal
:
React
.
FC
<
propType
>
=
(
props
)
=>
{
AddModuleModal
.
defaultProps
=
{
data
:
undefined
,
};
// 参数
const
{
title
,
open
,
closed
,
data
}
=
props
;
// 表单钩子
const
[
form
]
=
Form
.
useForm
<
ReqType
>
();
// 关闭弹窗
const
handleCancel
=
()
=>
{
form
.
resetFields
();
closed
();
};
// 确认事件
const
handleOk
=
()
=>
{
form
.
validateFields
()
.
then
(
async
(
values
)
=>
{
await
handleSubmit
(
values
);
})
.
catch
((
err
)
=>
{
message
.
warning
({
content
:
err
.
errorFields
[
0
].
errors
[
0
],
})
.
then
();
});
};
// 提交事件
const
handleSubmit
=
async
(
values
:
ReqType
)
=>
{
const
res
=
await
CommonAPI
.
insertModuleInfo
(
values
);
if
(
res
&&
res
.
code
===
'200'
)
{
message
.
success
(
'操作成功'
);
handleCancel
();
}
// console.log('提交事件 --->', values);
};
// componentDidMount
useEffect
(()
=>
{
if
(
!
open
)
return
;
if
(
!
data
)
return
;
form
.
setFieldsValue
(
data
);
// console.log('data --->', data);
},
[
open
]);
return
(
<
Modal
open=
{
open
}
title=
{
title
}
onCancel=
{
handleCancel
}
onOk=
{
handleOk
}
destroyOnClose
>
<
Form
name=
'addForm'
form=
{
form
}
labelAlign=
'right'
labelCol=
{
{
span
:
4
}
}
wrapperCol=
{
{
span
:
10
}
}
>
<
Form
.
Item
label=
'模块名称'
name=
'moduleName'
rules=
{
[{
required
:
true
,
message
:
'请输入模块名称'
}]
}
>
<
Input
placeholder=
{
'请输入模块名称'
}
maxLength=
{
20
}
allowClear
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'所属产品'
name=
'moduleType'
rules=
{
[{
required
:
true
,
message
:
'请选择所属产品'
}]
}
>
<
Select
placeholder=
{
'请选择所属产品'
}
options=
{
moduleType
}
allowClear
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'模块代码'
name=
'moduleCode'
rules=
{
[{
required
:
true
,
message
:
'请输入模块代码'
}]
}
>
<
Input
placeholder=
{
'请输入模块代码'
}
maxLength=
{
20
}
allowClear
/>
</
Form
.
Item
>
</
Form
>
</
Modal
>
);
};
export
default
AddModuleModal
;
src/pages/resourceManage/materielManage/detail/index.tsx
0 → 100644
浏览文件 @
4e866e97
差异被折叠。
点击展开。
src/pages/resourceManage/materielManage/index.tsx
0 → 100644
浏览文件 @
4e866e97
import
{
useEffect
,
useState
}
from
'react'
;
import
SearchBox
from
'~/components/search-box'
;
import
{
Button
,
message
,
Modal
,
Table
}
from
'antd'
;
import
{
PlusOutlined
}
from
'@ant-design/icons'
;
import
{
InterListType
,
InterReqListType
}
from
'~/api/interface'
;
import
{
listModuleInfoPage
}
from
'~/api/interface/commonType'
;
import
{
ColumnsType
}
from
'antd/es/table'
;
import
{
CommonAPI
}
from
'~/api'
;
import
RemarkChange
from
'~/components/remarkChange'
;
import
AddModuleModal
from
'~/pages/resourceManage/materielManage/comp/addModuleModal'
;
import
qs
from
'query-string'
;
import
{
useNavigate
}
from
'react-router-dom'
;
// 列表类型
type
TableType
=
InterListType
<
listModuleInfoPage
>
;
// 请求的参数
type
ReqType
=
InterReqListType
<
listModuleInfoPage
>
;
// 搜索表单的数据
let
query
:
ReqType
=
{};
// 所属产品
const
moduleType
=
[
{
label
:
'云享飞'
,
value
:
0
},
{
label
:
'云飞手'
,
value
:
1
},
{
label
:
'云仓'
,
value
:
2
},
{
label
:
'无人机城'
,
value
:
3
},
];
const
MaterielManageView
=
()
=>
{
const
{
confirm
}
=
Modal
;
// 路由钩子
const
navigate
=
useNavigate
();
// 备注弹窗是否开启
const
[
remarkModalVisible
,
setRemarkModalVisible
]
=
useState
(
false
);
// 新增弹窗是否开启
const
[
addModalVisible
,
setAddModalVisible
]
=
useState
(
false
);
// 需要编辑的数据
const
[
editData
,
setEditData
]
=
useState
<
TableType
[
0
]
>
();
// 表格数据
const
[
tableData
,
setTableData
]
=
useState
<
TableType
>
([]);
// 表格分页配置
const
[
pagination
,
setPagination
]
=
useState
({
total
:
0
,
pageSize
:
10
,
current
:
1
,
totalPage
:
0
,
});
// 加载列表
const
getTableList
=
async
(
value
=
{})
=>
{
// 只需要修改这个地方的接口即可
const
res
=
await
CommonAPI
.
listModuleInfoPage
({
pageNo
:
pagination
.
current
,
pageSize
:
pagination
.
pageSize
,
...
value
,
...
query
,
});
if
(
res
&&
res
.
code
===
'200'
)
{
const
{
list
,
pageNo
,
totalCount
,
pageSize
,
totalPage
}
=
res
.
result
;
// 解构
setPagination
({
total
:
totalCount
,
current
:
pageNo
,
pageSize
,
totalPage
,
});
setTableData
(
list
);
}
};
// 翻页
const
paginationChange
=
(
pageNo
:
number
,
pageSize
:
number
)
=>
{
getTableList
({
pageNo
,
pageSize
}).
then
();
};
// 表单提交
const
onFinish
=
(
data
:
ReqType
)
=>
{
pagination
.
current
=
1
;
query
=
data
;
getTableList
(
data
).
then
();
};
// 打开修改备注弹窗
const
handleRemark
=
(
record
:
TableType
[
0
])
=>
{
setEditData
(
record
);
setRemarkModalVisible
(
true
);
};
// 修改备注
const
handleRemarkChange
=
async
(
data
:
TableType
[
0
])
=>
{
const
res
=
await
CommonAPI
.
updateModuleInfoRemark
({
id
:
data
.
id
,
remark
:
data
.
remark
,
});
if
(
res
&&
res
.
code
===
'200'
)
{
paginationChange
(
pagination
.
current
,
pagination
.
pageSize
);
setEditData
(
undefined
);
setRemarkModalVisible
(
false
);
}
};
// 删除数据
const
handleDelete
=
(
record
:
TableType
[
0
])
=>
{
confirm
({
title
:
'提示'
,
content
:
'是否删除该模块?'
,
onOk
:
async
()
=>
{
const
res
=
await
CommonAPI
.
removeModuleInfo
({
id
:
record
.
id
});
if
(
res
&&
res
.
code
===
'200'
)
{
paginationChange
(
pagination
.
current
,
pagination
.
pageSize
);
await
message
.
success
(
'删除成功'
);
}
},
});
};
// 跳转详情
const
handleDetail
=
(
record
:
TableType
[
0
])
=>
{
const
search
=
{
id
:
record
.
id
,
moduleCode
:
record
.
moduleCode
,
moduleName
:
record
.
moduleName
,
moduleType
:
record
.
moduleType
,
};
navigate
(
`/resourceManage/materielManage/detail?
${
qs
.
stringify
(
search
)}
`
);
};
// componentDidMount
useEffect
(()
=>
{
query
=
{};
getTableList
().
then
();
},
[]);
// 表格结构
const
columns
:
ColumnsType
<
TableType
[
0
]
>
=
[
{
title
:
'序号'
,
dataIndex
:
'accountNo'
,
align
:
'center'
,
width
:
'50px'
,
render
:
(
_text
,
_record
,
index
)
=>
(
pagination
.
current
-
1
)
*
pagination
.
pageSize
+
index
+
1
,
},
{
title
:
'模块名称'
,
dataIndex
:
'moduleName'
,
align
:
'center'
,
},
{
title
:
'所属产品'
,
dataIndex
:
'moduleType'
,
align
:
'center'
,
render
:
(
text
)
=>
moduleType
?.
find
((
i
)
=>
i
.
value
===
text
)?.
label
||
text
,
},
{
title
:
'模块代码'
,
dataIndex
:
'moduleCode'
,
align
:
'center'
,
},
{
title
:
'备注'
,
dataIndex
:
'remark'
,
align
:
'center'
,
width
:
'150px'
,
ellipsis
:
true
,
render
:
(
text
,
record
)
=>
(
<
Button
type=
{
'link'
}
onClick=
{
()
=>
handleRemark
(
record
)
}
>
{
text
?
text
:
'--'
}
</
Button
>
),
},
{
title
:
'操作'
,
dataIndex
:
'action'
,
align
:
'center'
,
width
:
'150px'
,
fixed
:
'right'
,
render
:
(
_text
,
record
)
=>
(
<>
<
Button
type=
{
'link'
}
onClick=
{
()
=>
handleDetail
(
record
)
}
>
详情
</
Button
>
<
Button
type=
{
'link'
}
danger
onClick=
{
()
=>
handleDelete
(
record
)
}
>
删除
</
Button
>
</>
),
},
];
return
(
<>
<
SearchBox
search=
{
[
{
label
:
'模块名称'
,
name
:
'keyword'
,
type
:
'input'
,
placeholder
:
'请输入模块名称'
,
},
{
label
:
'所属产品'
,
name
:
'moduleType'
,
type
:
'Select'
,
placeholder
:
'请选择所属产品'
,
options
:
moduleType
,
},
{
label
:
'模块代码'
,
name
:
'keyword'
,
type
:
'input'
,
placeholder
:
'请输入模块代码'
,
},
]
}
child=
{
<>
<
Button
type=
{
'primary'
}
icon=
{
<
PlusOutlined
/>
}
onClick=
{
()
=>
{
setAddModalVisible
(
true
);
}
}
>
新建
</
Button
>
</>
}
searchData=
{
onFinish
}
/>
<
Table
size=
'small'
dataSource=
{
tableData
}
columns=
{
columns
}
rowKey=
'id'
// scroll={{ x: 1500 }}
bordered
pagination=
{
{
total
:
pagination
.
total
,
pageSize
:
pagination
.
pageSize
,
current
:
pagination
.
current
,
showSizeChanger
:
true
,
showQuickJumper
:
true
,
onChange
:
(
page
:
number
,
pageSize
:
number
)
=>
paginationChange
(
page
,
pageSize
),
showTotal
:
(
total
,
range
)
=>
`当前 ${range[0]}-${range[1]} 条记录 / 共 ${total} 条数据`
,
}
}
/>
<
RemarkChange
open=
{
remarkModalVisible
}
data=
{
editData
}
closed=
{
()
=>
{
paginationChange
(
pagination
.
current
,
pagination
.
pageSize
);
setEditData
(
undefined
);
setRemarkModalVisible
(
false
);
}
}
change=
{
handleRemarkChange
}
/>
<
AddModuleModal
open=
{
addModalVisible
}
title=
{
editData
?.
id
?
'编辑'
:
'新增'
}
data=
{
editData
}
closed=
{
()
=>
{
paginationChange
(
pagination
.
current
,
pagination
.
pageSize
);
setEditData
(
undefined
);
setAddModalVisible
(
false
);
}
}
/>
</>
);
};
export
default
MaterielManageView
;
src/pages/systemManage/accountManage/comp/addEditModal/index.tsx
浏览文件 @
4e866e97
...
...
@@ -45,6 +45,8 @@ const AddEditModal: React.FC<propType> = (props) => {
};
// 提交事件
const
handleSubmit
=
async
(
values
:
ReqType
)
=>
{
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const
res
=
await
SystemManageAPI
[
data
?.
id
?
'updateBAccount'
:
'insertBAccount'
]({
...
data
,
...
values
,
...
...
src/router/router.tsx
浏览文件 @
4e866e97
...
...
@@ -25,6 +25,8 @@ import {
CoffeeOutlined
,
UnorderedListOutlined
,
BookOutlined
,
SketchOutlined
,
DribbbleOutlined
,
}
from
'@ant-design/icons'
;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
...
...
@@ -46,6 +48,8 @@ import CustomMoneyView from '~/pages/customManage/customMoney';
import
CustomMoneyDetail
from
'~/pages/customManage/customMoney/detail'
;
import
AccountManageView
from
'~/pages/systemManage/accountManage'
;
import
CourseManageView
from
'~/pages/mallManage/courseManage'
;
import
MaterielManageView
from
'~/pages/resourceManage/materielManage'
;
import
MaterielManageDetail
from
'~/pages/resourceManage/materielManage/detail'
;
// 活动
// const ActivityList = React.lazy(() => import('src/pages/activityManage/activityList')); //活动管理
...
...
@@ -677,6 +681,37 @@ export const routerList: Array<RouteObjectType> = [
// ],
// },
{
path
:
'/resourceManage'
,
element
:
<
LayoutView
/>,
errorElement
:
<
ErrorPage
/>,
meta
:
{
id
:
30000
,
icon
:
<
DribbbleOutlined
/>,
title
:
'资源管理'
,
},
children
:
[
{
path
:
'/resourceManage/materielManage'
,
element
:
withLoadingComponent
(<
MaterielManageView
/>),
meta
:
{
id
:
30100
,
title
:
'物料管理'
,
icon
:
<
SketchOutlined
/>,
},
},
{
path
:
'/resourceManage/materielManage/detail'
,
element
:
withLoadingComponent
(<
MaterielManageDetail
/>),
meta
:
{
id
:
30100
,
title
:
'物料详情'
,
icon
:
<
SketchOutlined
/>,
hidden
:
true
,
},
},
],
},
{
path
:
'/systemManage'
,
element
:
<
LayoutView
/>,
errorElement
:
<
ErrorPage
/>,
...
...
src/store/index.ts
浏览文件 @
4e866e97
import
{
configureStore
}
from
'@reduxjs/toolkit'
;
import
{
Menu
}
from
'./module/menu'
;
import
{
UserInfo
}
from
'./module/userInfo'
;
import
{
Page
}
from
'~/store/module/page'
;
export
const
store
=
configureStore
({
reducer
:
{
Page
,
Menu
,
UserInfo
,
},
...
...
src/store/module/page/index.ts
0 → 100644
浏览文件 @
4e866e97
import
{
createSlice
}
from
'@reduxjs/toolkit'
;
const
initialState
=
{
pageCurrent
:
JSON
.
parse
(
localStorage
.
getItem
(
'SXTB-ADMIN-PAGE-CURRENT'
)
as
string
)
||
[],
};
export
const
pageSlice
=
createSlice
({
name
:
'pageSlice'
,
initialState
,
reducers
:
{
SET_PAGE_CURRENT
(
state
,
action
)
{
state
.
pageCurrent
=
action
.
payload
;
localStorage
.
setItem
(
'SXTB-ADMIN-PAGE-CURRENT'
,
JSON
.
stringify
(
action
.
payload
));
},
},
});
export
const
{
SET_PAGE_CURRENT
}
=
pageSlice
.
actions
;
export
const
Page
=
pageSlice
.
reducer
;
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论