Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-platform
Commits
c549a696
Commit
c549a696
authored
Oct 28, 2020
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
39730bde
069925a8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
284 additions
and
157 deletions
+284
-157
menu.ts
src/locales/zh-CN/menu.ts
+2
-0
index.ts
src/module/productModule/index.ts
+3
-1
addProducts.tsx
src/pages/commodity/products/addProducts.tsx
+6
-4
priceAttributeForm.tsx
...commodity/products/addProductsItem/priceAttributeForm.tsx
+36
-29
addCompany.tsx
src/pages/logistics/list/addCompany.tsx
+10
-3
checkDetail.tsx
...dSettle/amountAccountManage/checkWithdraw/checkDetail.tsx
+74
-22
index.tsx
.../payandSettle/amountAccountManage/checkWithdraw/index.tsx
+41
-12
index.tsx
...dSettle/amountAccountManage/memberAccountManage/index.tsx
+4
-3
memberAccountDetail.tsx
...AccountManage/memberAccountManage/memberAccountDetail.tsx
+3
-1
index.tsx
...ayandSettle/amountAccountManage/paymentWithdraw/index.tsx
+2
-1
accountDetail.tsx
...yandSettle/capitalAccounts/accountLists/accountDetail.tsx
+6
-5
applyWithdraw.tsx
...yandSettle/capitalAccounts/accountLists/applyWithdraw.tsx
+3
-2
index.less
...ages/payandSettle/capitalAccounts/accountLists/index.less
+14
-14
index.tsx
...pages/payandSettle/capitalAccounts/accountLists/index.tsx
+6
-5
constant.ts
src/pages/payandSettle/constant.ts
+14
-5
index.tsx
...dSettle/creditApplication/components/DetailInfo/index.tsx
+29
-18
index.tsx
...editApplication/components/QuotaApplicationInfo/index.tsx
+6
-21
index.ts
...plication/components/QuotaApplicationInfo/schema/index.ts
+2
-2
index.tsx
...s/payandSettle/creditApplication/quotaFormQuery/index.tsx
+1
-1
apply.tsx
...ages/payandSettle/creditApplication/quotaMenage/apply.tsx
+2
-2
index.tsx
...tion/quotaMenage/detail/components/IntroduceRow/index.tsx
+10
-3
index.tsx
...ages/payandSettle/creditApplication/quotaMenage/index.tsx
+1
-1
tableStatusList.tsx
src/pages/transaction/common/tableStatusList.tsx
+2
-0
detail.tsx
src/pages/transaction/enquiryOffer/components/detail.tsx
+0
-0
index.tsx
src/pages/transaction/enquiryOffer/components/index.tsx
+0
-0
detail.tsx
src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx
+2
-1
index.ts
src/store/product/index.ts
+5
-0
index.tsx
src/utils/index.tsx
+0
-1
No files found.
src/locales/zh-CN/menu.ts
View file @
c549a696
...
@@ -224,6 +224,8 @@ export default {
...
@@ -224,6 +224,8 @@ export default {
'menu.tranactionAbility.stockSellStorage.inventory'
:
'库存'
,
'menu.tranactionAbility.stockSellStorage.inventory'
:
'库存'
,
'menu.tranactionAbility.transactionRules'
:
'交易规则'
,
'menu.tranactionAbility.transactionRules'
:
'交易规则'
,
'menu.tranactionAbility.addRule'
:
'新建交易规则'
,
'menu.tranactionAbility.addRule'
:
'新建交易规则'
,
'menu.tranactionAbility.editRule'
:
'编辑交易规则'
,
'menu.tranactionAbility.ruleDetail'
:
'交易规则详情'
,
// 需求发布 2020-10-26修改
// 需求发布 2020-10-26修改
'menu.tranactionAbility.enquirySubmit'
:
'需求发布'
,
'menu.tranactionAbility.enquirySubmit'
:
'需求发布'
,
...
...
src/module/productModule/index.ts
View file @
c549a696
import
{
GetProductGoodsGetGoodsListResponseDetail
,
GetProductCommodityGetCommodityResponse
}
from
'@/services'
;
import
{
GetProductGoodsGetGoodsListResponseDetail
,
GetProductCommodityGetCommodityResponse
}
from
'@/services
/ProductApi
'
;
export
interface
IBasicFormParam
{
export
interface
IBasicFormParam
{
brandId
:
number
;
brandId
:
number
;
...
@@ -65,6 +65,7 @@ export interface IProductModule {
...
@@ -65,6 +65,7 @@ export interface IProductModule {
productAttributeAndImageParams
:
any
[];
//价格属性包含图片的传输数据
productAttributeAndImageParams
:
any
[];
//价格属性包含图片的传输数据
areaOption
:
any
[];
// 省市数据
areaOption
:
any
[];
// 省市数据
currentPageInStore
:
IPage
;
currentPageInStore
:
IPage
;
tabClickItem
:
any
[];
setAttributeLists
(
lists
:
any
[]):
void
;
setAttributeLists
(
lists
:
any
[]):
void
;
setProductName
(
name
:
string
):
void
;
setProductName
(
name
:
string
):
void
;
...
@@ -79,4 +80,5 @@ export interface IProductModule {
...
@@ -79,4 +80,5 @@ export interface IProductModule {
setAreaOption
(
datas
:
any
[]):
void
;
setAreaOption
(
datas
:
any
[]):
void
;
setProductInfoByEdit
(
data
:
GetProductCommodityGetCommodityResponse
):
void
;
setProductInfoByEdit
(
data
:
GetProductCommodityGetCommodityResponse
):
void
;
setCurrentPageInStore
(
data
:
IPage
):
void
;
setCurrentPageInStore
(
data
:
IPage
):
void
;
setTabClickItem
(
data
:
any
):
void
;
}
}
src/pages/commodity/products/addProducts.tsx
View file @
c549a696
...
@@ -50,7 +50,8 @@ const AddProducts: React.FC<{}> = (props) => {
...
@@ -50,7 +50,8 @@ const AddProducts: React.FC<{}> = (props) => {
isAllAttributePic
,
isAllAttributePic
,
productInfoByEdit
,
productInfoByEdit
,
selectCategoryId
,
selectCategoryId
,
clearPartData
clearPartData
,
setTabClickItem
}
=
ProductStore
}
=
ProductStore
useEffect
(()
=>
{
useEffect
(()
=>
{
...
@@ -161,7 +162,7 @@ const AddProducts: React.FC<{}> = (props) => {
...
@@ -161,7 +162,7 @@ const AddProducts: React.FC<{}> = (props) => {
// 移除描述中的[]
// 移除描述中的[]
let
_productDescription
=
{
...
productDescription
}
let
_productDescription
=
{
...
productDescription
}
for
(
let
i
in
_productDescription
){
for
(
let
i
in
_productDescription
){
if
(
_productDescription
[
i
].
length
===
0
){
if
(
_productDescription
[
i
]
?
.
length
===
0
){
delete
_productDescription
[
i
]
delete
_productDescription
[
i
]
}
}
}
}
...
@@ -304,13 +305,12 @@ const AddProducts: React.FC<{}> = (props) => {
...
@@ -304,13 +305,12 @@ const AddProducts: React.FC<{}> = (props) => {
}
}
console
.
log
(
e
,
'e'
)
console
.
log
(
e
,
'e'
)
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
console
.
log
(
error
,
'_error'
)
setIsDisableSaveBtn
(
false
)
setIsDisableSaveBtn
(
false
)
if
(
error
.
messge
)
if
(
error
.
messge
)
message
.
error
(
error
.
message
)
message
.
error
(
error
.
message
)
else
else
message
.
error
(
error
.
errorFields
[
0
].
errors
.
toString
())
message
.
error
(
error
.
errorFields
[
0
].
errors
.
toString
())
console
.
log
(
error
,
'_error'
)
})
})
}
catch
(
e
)
{
}
catch
(
e
)
{
setIsDisableSaveBtn
(
false
)
setIsDisableSaveBtn
(
false
)
...
@@ -330,6 +330,8 @@ const AddProducts: React.FC<{}> = (props) => {
...
@@ -330,6 +330,8 @@ const AddProducts: React.FC<{}> = (props) => {
const
callback
=
(
key
:
any
)
=>
{
const
callback
=
(
key
:
any
)
=>
{
setClickTabIndex
([...
clickTabIndex
,
key
])
setClickTabIndex
([...
clickTabIndex
,
key
])
// 点击项存入store 用于后续编辑步骤判断 是直接点击进去某个子模块还是已经进入子模块 从而采用缓存数据还是采用接口返回的编辑数据
setTabClickItem
([...
clickTabIndex
,
key
])
}
}
return
(<
PageHeaderWrapper
return
(<
PageHeaderWrapper
...
...
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @
c549a696
...
@@ -69,6 +69,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
...
@@ -69,6 +69,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
getPriceAttributeFormParamsByEdit
,
getPriceAttributeFormParamsByEdit
,
selectCategoryId
,
selectCategoryId
,
productAttributeAndImageParams
,
productAttributeAndImageParams
,
tabClickItem
}
=
ProductStore
}
=
ProductStore
_tableDataSource
=
useMemo
(()
=>
tableDataSource
,
[
tableDataSource
])
// 保持最新值
_tableDataSource
=
useMemo
(()
=>
tableDataSource
,
[
tableDataSource
])
// 保持最新值
...
@@ -193,7 +194,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
...
@@ -193,7 +194,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
let
{
_attributeNameArr
,
_attributeValueArr
,
_temp_attributeObjArr
,
_temp_attributeValObjArr
}
=
needObject
let
{
_attributeNameArr
,
_attributeValueArr
,
_temp_attributeObjArr
,
_temp_attributeValObjArr
}
=
needObject
//
console.log(_priceAttribute, _attributeNameArr, _attributeValueArr, _temp_attributeObjArr, _temp_attributeValObjArr, selectedGoods, '---constructimg---') // 编辑直接进入价格设置 都为空数组
console
.
log
(
_priceAttribute
,
_attributeNameArr
,
_attributeValueArr
,
_temp_attributeObjArr
,
_temp_attributeValObjArr
,
selectedGoods
,
'---constructimg---'
)
// 编辑直接进入价格设置 都为空数组
if
(
selectedGoods
.
length
>
0
){
// 编辑情况下 select货品列表可能会采用接口数据
if
(
selectedGoods
.
length
>
0
){
// 编辑情况下 select货品列表可能会采用接口数据
_col
.
push
({
_col
.
push
({
...
@@ -211,32 +212,34 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
...
@@ -211,32 +212,34 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
</
Select
>
</
Select
>
</>
</>
})
})
}
else
if
(
history
.
location
.
query
?.
id
){
// 此时没有货品并且处于编辑状态 取接口返回的数据
let
_goods
:
any
[]
=
Object
.
values
(
productInfoByEdit
.
unitPriceAndPicList
.
map
(
_
=>
_
.
goods
))
if
(
_goods
.
indexOf
(
null
)
===-
1
){
let
goodsInApi
:
any
=
Object
.
values
(
_goods
.
reduce
((
item
,
next
)
=>
{
item
[
next
.
id
]
=
next
return
item
},{}))
if
(
goodsInApi
.
length
>
0
){
// *9.12*
_col
.
push
({
title
:
'对应货品'
,
dataIndex
:
'对应货品'
,
key
:
'对应货品'
,
width
:
360
,
render
:
(
text
:
any
,
record
:
any
)
=>
<>
<
Select
style=
{
{
width
:
'100%'
}
}
defaultValue=
{
text
}
onChange=
{
(
v
)
=>
{
tableSelelctChange
(
v
,
record
)
}
}
>
{
goodsInApi
.
map
(
_item
=>
(
<
Option
key=
{
_item
.
id
}
value=
{
_item
.
id
}
>
{
_item
.
code
}
/
{
_item
.
name
}
/
{
_item
.
type
}
/¥
{
_item
.
costPrice
}
</
Option
>
))
}
</
Select
>
</>
})
}
}
}
}
/** 注释原因:编辑时操作货品 没有更新价格属性表格中的货品选项 */
// else if(history.location.query?.id){ // 此时没有货品并且处于编辑状态 取接口返回的数据
// let _goods: any[] = Object.values(productInfoByEdit.unitPriceAndPicList.map(_ => _.goods))
// if(_goods.indexOf(null)===-1){
// let goodsInApi : any = Object.values(_goods.reduce((item, next)=>{
// item[next.id] = next
// return item
// },{}))
// if(goodsInApi.length > 0){
// _col.push({
// title: '对应货品',
// dataIndex: '对应货品',
// key: '对应货品',
// width: 360,
// render: (text: any, record: any) => <>
// <Select style={{width:'100%'}} defaultValue={text} onChange={(v)=> {tableSelelctChange(v, record) }}>
// {
// goodsInApi.map(_item => (
// <Option key={_item.id} value={_item.id}>{_item.code}/{_item.name}/{_item.type}/¥{_item.costPrice}</Option>
// ))
// }
// </Select>
// </>
// })
// }
// }
// }
if
(
_attributeNameArr
?.
length
>
0
){
if
(
_attributeNameArr
?.
length
>
0
){
_attributeNameArr
.
map
(
_attr
=>
{
_attributeNameArr
.
map
(
_attr
=>
{
...
@@ -276,7 +279,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
...
@@ -276,7 +279,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
setColumns
(
_col
)
setColumns
(
_col
)
// 生成表格data
// 生成表格data
Source
let
combineArray
=
SKUCombine
(
_attributeValueArr
)
let
combineArray
=
SKUCombine
(
_attributeValueArr
)
setCombineAttributeArray
(
combineArray
)
setCombineAttributeArray
(
combineArray
)
setAttributeObjArr
(
_temp_attributeObjArr
)
setAttributeObjArr
(
_temp_attributeObjArr
)
...
@@ -292,8 +295,12 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
...
@@ -292,8 +295,12 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
})
:
_tempObj
[
_attributeNameArr
[
i
]
||
_attributeNameArr
[
0
]]
=
_rowArr
// 当一项变动的时候 找_attributeNameArr可能会找不到 找不到的情况下置为索引0的那项
})
:
_tempObj
[
_attributeNameArr
[
i
]
||
_attributeNameArr
[
0
]]
=
_rowArr
// 当一项变动的时候 找_attributeNameArr可能会找不到 找不到的情况下置为索引0的那项
if
(
history
.
location
.
query
?.
id
){
if
(
history
.
location
.
query
?.
id
){
// 编辑的时候,先指定数据中的货品id,如果是重新组合的不存在id就使用选择的货品中的第一个,如果没有置为0;同理,不存在单价就置为{}
// 编辑的时候,先指定数据中的货品id,如果是重新组合的不存在id就使用选择的货品中的第一个,如果没有置为0;同理,不存在单价就置为{}
// _tempObj['对应货品'] = selectedGoods.length > 0 ? selectedGoods[0].id : 0
_tempObj
[
'对应货品'
]
=
productInfoByEdit
.
unitPriceAndPicList
[
i
]?.
goods
?.
id
||
selectedGoods
[
0
]?.
id
||
0
_tempObj
[
'对应货品'
]
=
productInfoByEdit
.
unitPriceAndPicList
[
i
]?.
goods
?.
id
||
selectedGoods
[
0
]?.
id
||
0
_tempObj
[
'单价'
]
=
productInfoByEdit
.
unitPriceAndPicList
[
i
]?.
unitPrice
||
{}
_tempObj
[
'单价'
]
=
productInfoByEdit
.
unitPriceAndPicList
[
i
]?.
unitPrice
||
{}
console
.
log
(
_tableDataSource
,
'编辑构建table数据的时候'
)
console
.
log
(
tabClickItem
,
'store中的点项'
)
// 通过store中的点击项可以判断当前表格的数据是采用接口返回的全局编辑数据还是子模块的局部缓存数据
}
else
{
}
else
{
_tempObj
[
'对应货品'
]
=
selectedGoods
.
length
>
0
?
selectedGoods
[
0
].
id
:
0
_tempObj
[
'对应货品'
]
=
selectedGoods
.
length
>
0
?
selectedGoods
[
0
].
id
:
0
_tempObj
[
'单价'
]
=
{}
_tempObj
[
'单价'
]
=
{}
...
@@ -307,7 +314,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
...
@@ -307,7 +314,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
_tempObj
[
'单价'
]
=
productInfoByEdit
?.
unitPriceAndPicList
[
0
]?.
unitPrice
||
{}
_tempObj
[
'单价'
]
=
productInfoByEdit
?.
unitPriceAndPicList
[
0
]?.
unitPrice
||
{}
_tableData
.
push
(
_tempObj
)
_tableData
.
push
(
_tempObj
)
}
}
//
console.log(_tableData, '_tableData') // 只有一项 变动情况下表格数据的key获取不到
console
.
log
(
_tableData
,
'_tableData'
)
// 只有一项 变动情况下表格数据的key获取不到
_tableDataSource
=
_tableData
_tableDataSource
=
_tableData
// 有前面tab变动引起的二次构建 需要清空价格数据
// 有前面tab变动引起的二次构建 需要清空价格数据
if
(
updateFlag
.
current
){
if
(
updateFlag
.
current
){
...
@@ -450,7 +457,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
...
@@ -450,7 +457,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
}
}
_tableDataSource
=
newTabeData
_tableDataSource
=
newTabeData
setTableDataSource
(
_tableDataSource
)
setTableDataSource
(
_tableDataSource
)
//
console.log(_tableDataSource, curretSetPriceRow, v, isBatchSetting, 'setPriceOk')
console
.
log
(
_tableDataSource
,
curretSetPriceRow
,
v
,
isBatchSetting
,
'setPriceOk'
)
})
})
}
}
...
...
src/pages/logistics/list/addCompany.tsx
View file @
c549a696
...
@@ -340,9 +340,16 @@ const company: React.FC<parmas> = (props) => {
...
@@ -340,9 +340,16 @@ const company: React.FC<parmas> = (props) => {
<
Button
loading=
{
loading
}
onClick=
{
handleSubmitAllSetting
}
type=
"primary"
style=
{
{
marginTop
:
32
,
marginBottom
:
16
,
marginRight
:
24
}
}
>
<
Button
loading=
{
loading
}
onClick=
{
handleSubmitAllSetting
}
type=
"primary"
style=
{
{
marginTop
:
32
,
marginBottom
:
16
,
marginRight
:
24
}
}
>
保存
保存
</
Button
>
</
Button
>
<
Button
onClick=
{
handleCancel
}
style=
{
{
marginTop
:
32
,
marginBottom
:
16
}
}
>
<
Popconfirm
取消
title=
"未保存,是否确定执行这个操作?"
</
Button
>
onConfirm=
{
handleCancel
}
okText=
"是"
cancelText=
"否"
>
<
Button
style=
{
{
marginTop
:
32
,
marginBottom
:
16
}
}
>
取消
</
Button
>
</
Popconfirm
>
</
Col
>
</
Col
>
</
Row
>
</
Row
>
</
Col
>
</
Col
>
...
...
src/pages/payandSettle/amountAccountManage/checkWithdraw/checkDetail.tsx
View file @
c549a696
This diff is collapsed.
Click to expand it.
src/pages/payandSettle/amountAccountManage/checkWithdraw/index.tsx
View file @
c549a696
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
import
{
Card
,
Space
,
Button
,
}
from
'antd'
import
{
history
}
from
'umi'
import
{
Card
,
Space
,
Button
,
Modal
,
message
}
from
'antd'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
StandardTable
}
from
'god'
import
{
StandardTable
}
from
'god'
import
{
ColumnType
}
from
'antd/lib/table/interface'
import
{
ColumnType
}
from
'antd/lib/table/interface'
...
@@ -9,17 +10,20 @@ import { createFormActions, FormEffectHooks } from '@formily/antd'
...
@@ -9,17 +10,20 @@ import { createFormActions, FormEffectHooks } from '@formily/antd'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
searchSchema
}
from
'./schema'
import
{
searchSchema
}
from
'./schema'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
PlusOutlined
}
from
'@ant-design/icons'
import
EyePreview
from
'@/components/EyePreview'
import
EyePreview
from
'@/components/EyePreview'
import
{
DatePicker
}
from
'@formily/antd-components'
import
{
DatePicker
}
from
'@formily/antd-components'
import
StatusTag
from
'@/components/StatusTag'
import
StatusTag
from
'@/components/StatusTag'
import
{
accountStatusMap
,
memberS
tatusMap
}
from
'../../constant'
import
{
s
tatusMap
}
from
'../../constant'
import
moment
from
'moment'
import
moment
from
'moment'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
ExclamationCircleOutlined
}
from
'@ant-design/icons'
const
{
confirm
}
=
Modal
const
formActions
=
createFormActions
();
const
formActions
=
createFormActions
();
const
CheckWithdraw
:
React
.
FC
<
{}
>
=
()
=>
{
const
CheckWithdraw
:
React
.
FC
<
{}
>
=
()
=>
{
const
ref
=
useRef
<
any
>
({})
const
ref
=
useRef
<
any
>
({})
const
[
withdrawRowSelection
,
withdrawRowCtl
]
=
useRowSelectionTable
()
const
columns
:
ColumnType
<
any
>
[]
=
[
const
columns
:
ColumnType
<
any
>
[]
=
[
{
{
...
@@ -28,7 +32,7 @@ const CheckWithdraw: React.FC<{}> = () => {
...
@@ -28,7 +32,7 @@ const CheckWithdraw: React.FC<{}> = () => {
key
:
'memberAssetAccount'
,
key
:
'memberAssetAccount'
,
className
:
'commonPickColor'
,
className
:
'commonPickColor'
,
render
:
(
text
,
record
)
=>
<
EyePreview
render
:
(
text
,
record
)
=>
<
EyePreview
url=
{
`/memberCenter/payandSettle/amountAccountManage/memberAccountManage/detail?id=${record.id}`
}
url=
{
`/memberCenter/payandSettle/amountAccountManage/memberAccountManage/detail?id=${record.
memberAssetAccount.
id}`
}
>
>
{
text
}
{
text
}
</
EyePreview
>
</
EyePreview
>
...
@@ -45,8 +49,9 @@ const CheckWithdraw: React.FC<{}> = () => {
...
@@ -45,8 +49,9 @@ const CheckWithdraw: React.FC<{}> = () => {
},
},
{
{
title
:
'提现金额(元)'
,
title
:
'提现金额(元)'
,
dataIndex
:
'memberRoleName'
,
dataIndex
:
'tradeMoney'
,
key
:
'memberRoleName'
,
key
:
'tradeMoney'
,
render
:
(
t
,
r
)
=>
t
.
toFixed
(
2
)
},
},
{
{
title
:
'提现申请时间'
,
title
:
'提现申请时间'
,
...
@@ -55,10 +60,10 @@ const CheckWithdraw: React.FC<{}> = () => {
...
@@ -55,10 +60,10 @@ const CheckWithdraw: React.FC<{}> = () => {
render
:
(
t
,
r
)
=>
moment
(
t
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
render
:
(
t
,
r
)
=>
moment
(
t
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
},
},
{
{
title
:
'
会员
状态'
,
title
:
'状态'
,
dataIndex
:
'
memberS
tatus'
,
dataIndex
:
'
s
tatus'
,
key
:
'
memberS
tatus'
,
key
:
'
s
tatus'
,
render
:
(
t
,
r
)
=>
(<
StatusTag
title=
{
memberStatusMap
[
t
][
'title'
]
}
type=
{
memberS
tatusMap
[
t
][
'type'
]
}
/>)
render
:
(
t
,
r
)
=>
(<
StatusTag
title=
{
statusMap
[
t
][
'title'
]
}
type=
{
s
tatusMap
[
t
][
'type'
]
}
/>)
},
},
{
{
title
:
'操作'
,
title
:
'操作'
,
...
@@ -78,11 +83,34 @@ const CheckWithdraw: React.FC<{}> = () => {
...
@@ -78,11 +83,34 @@ const CheckWithdraw: React.FC<{}> = () => {
}
}
const
clickUp
=
(
r
:
any
)
=>
{
const
clickUp
=
(
r
:
any
)
=>
{
console
.
log
(
'通过'
)
let
params
=
{
tradeCode
:
r
.
tradeCode
,
id
:
r
.
memberAssetAccount
.
id
,
amount
:
r
.
tradeMoney
}
history
.
push
(
`/memberCenter/payandSettle/amountAccountManage/checkWithdraw/detail?detailinfo=
${
btoa
(
JSON
.
stringify
(
params
))}
`
)
}
}
const
handleBatchCheck
=
()
=>
{
const
handleBatchCheck
=
()
=>
{
console
.
log
(
'批量通过'
)
if
(
withdrawRowCtl
.
selectedRowKeys
.
length
>
0
){
confirm
({
title
:
'确定要执行批量审核操作?'
,
icon
:
<
ExclamationCircleOutlined
/>,
onOk
()
{
PublicApi
.
postPayMemberAssetAccountBatchCheck
({
idList
:
withdrawRowCtl
.
selectedRowKeys
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
},
okType
:
'danger'
,
onCancel
()
{
console
.
log
(
'Cancel'
);
},
okText
:
'确定'
,
cancelText
:
'取消'
})
}
else
{
message
.
error
(
'请先选择对应项目进行操作!'
)
}
}
}
const
controllerBtns
=
(
const
controllerBtns
=
(
...
@@ -100,6 +128,7 @@ const CheckWithdraw: React.FC<{}> = () => {
...
@@ -100,6 +128,7 @@ const CheckWithdraw: React.FC<{}> = () => {
columns=
{
columns
}
columns=
{
columns
}
currentRef=
{
ref
}
currentRef=
{
ref
}
tableProps=
{
{
rowKey
:
"id"
}
}
tableProps=
{
{
rowKey
:
"id"
}
}
rowSelection=
{
withdrawRowSelection
}
fetchTableData=
{
(
params
:
any
)
=>
fetchData
(
params
)
}
fetchTableData=
{
(
params
:
any
)
=>
fetchData
(
params
)
}
controlRender=
{
controlRender=
{
<
NiceForm
<
NiceForm
...
...
src/pages/payandSettle/amountAccountManage/memberAccountManage/index.tsx
View file @
c549a696
...
@@ -14,7 +14,7 @@ import EyePreview from '@/components/EyePreview'
...
@@ -14,7 +14,7 @@ import EyePreview from '@/components/EyePreview'
import
{
DatePicker
}
from
'@formily/antd-components'
import
{
DatePicker
}
from
'@formily/antd-components'
import
{
useAsyncInitSelect
}
from
'@/formSchema/effects/useAsyncInitSelect'
import
{
useAsyncInitSelect
}
from
'@/formSchema/effects/useAsyncInitSelect'
import
StatusTag
from
'@/components/StatusTag'
import
StatusTag
from
'@/components/StatusTag'
import
{
accountStatusMap
,
memberStatusMap
}
from
'../../constant'
import
{
account
MemberType
,
account
StatusMap
,
memberStatusMap
}
from
'../../constant'
import
LevelBrand
from
'@/pages/member/components/LevelBrand'
import
LevelBrand
from
'@/pages/member/components/LevelBrand'
import
{
validatorByte
}
from
'@/utils/regExp'
import
{
validatorByte
}
from
'@/utils/regExp'
import
{
GetPayMemberAssetAccountGetMemberAssetAccountListResponseDetail
}
from
'@/services/PayApi'
import
{
GetPayMemberAssetAccountGetMemberAssetAccountListResponseDetail
}
from
'@/services/PayApi'
...
@@ -44,8 +44,9 @@ const AccountLists: React.FC<{}> = () => {
...
@@ -44,8 +44,9 @@ const AccountLists: React.FC<{}> = () => {
},
},
{
{
title
:
'会员类型'
,
title
:
'会员类型'
,
dataIndex
:
'memberTypeName'
,
dataIndex
:
'memberType'
,
key
:
'memberTypeName'
,
key
:
'memberType'
,
render
:
(
t
,
r
)
=>
accountMemberType
[
t
]
},
},
{
{
title
:
'会员角色'
,
title
:
'会员角色'
,
...
...
src/pages/payandSettle/amountAccountManage/memberAccountManage/memberAccountDetail.tsx
View file @
c549a696
...
@@ -8,7 +8,7 @@ import StatusTag from '@/components/StatusTag'
...
@@ -8,7 +8,7 @@ import StatusTag from '@/components/StatusTag'
import
cx
from
'classnames'
import
cx
from
'classnames'
import
moment
from
'moment'
import
moment
from
'moment'
import
{
ColumnType
}
from
'antd/lib/table/interface'
import
{
ColumnType
}
from
'antd/lib/table/interface'
import
{
memberStatusMap
,
moveStatusMap
,
statusMap
}
from
'../../constant'
import
{
memberStatusMap
,
moveStatusMap
,
operationMap
,
statusMap
}
from
'../../constant'
import
{
SettingOutlined
,
StopOutlined
}
from
'@ant-design/icons'
import
{
SettingOutlined
,
StopOutlined
}
from
'@ant-design/icons'
import
{
validatorByte
}
from
'@/utils/regExp'
import
{
validatorByte
}
from
'@/utils/regExp'
import
{
PublicApi
}
from
'@/services/api'
import
{
PublicApi
}
from
'@/services/api'
...
@@ -79,11 +79,13 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -79,11 +79,13 @@ const AccountDetail: React.FC<{}> = () => {
title
:
'交易金额(元)'
,
title
:
'交易金额(元)'
,
dataIndex
:
'tradeMoney'
,
dataIndex
:
'tradeMoney'
,
key
:
'tradeMoney'
,
key
:
'tradeMoney'
,
render
:
(
t
,
r
)
=>
`
${
operationMap
[
r
.
operation
][
'operator'
]}
${
t
.
toFixed
(
2
)}
`
},
},
{
{
title
:
'交易项目'
,
title
:
'交易项目'
,
dataIndex
:
'operation'
,
dataIndex
:
'operation'
,
key
:
'operation'
,
key
:
'operation'
,
render
:
(
t
,
r
)
=>
operationMap
[
t
][
'title'
]
},
},
{
{
title
:
'状态'
,
title
:
'状态'
,
...
...
src/pages/payandSettle/amountAccountManage/paymentWithdraw/index.tsx
View file @
c549a696
...
@@ -47,6 +47,7 @@ const PaymentWithdraw: React.FC<{}> = () => {
...
@@ -47,6 +47,7 @@ const PaymentWithdraw: React.FC<{}> = () => {
title
:
'提现金额(元)'
,
title
:
'提现金额(元)'
,
dataIndex
:
'memberRoleName'
,
dataIndex
:
'memberRoleName'
,
key
:
'memberRoleName'
,
key
:
'memberRoleName'
,
render
:
(
t
,
r
)
=>
`¥
${
t
.
toFixed
(
2
)}
`
},
},
{
{
title
:
'提现申请时间'
,
title
:
'提现申请时间'
,
...
@@ -71,7 +72,7 @@ const PaymentWithdraw: React.FC<{}> = () => {
...
@@ -71,7 +72,7 @@ const PaymentWithdraw: React.FC<{}> = () => {
console
.
log
(
params
)
console
.
log
(
params
)
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
let
obj
=
{
...
params
}
let
obj
=
{
...
params
}
PublicApi
.
getPayMemberAssetAccountGet
Check
CashOutList
(
obj
).
then
(
res
=>
{
PublicApi
.
getPayMemberAssetAccountGet
Pay
CashOutList
(
obj
).
then
(
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
})
})
})
})
...
...
src/pages/payandSettle/capitalAccounts/accountLists/accountDetail.tsx
View file @
c549a696
...
@@ -78,12 +78,13 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -78,12 +78,13 @@ const AccountDetail: React.FC<{}> = () => {
title
:
'交易金额(元)'
,
title
:
'交易金额(元)'
,
dataIndex
:
'tradeMoney'
,
dataIndex
:
'tradeMoney'
,
key
:
'tradeMoney'
,
key
:
'tradeMoney'
,
render
:
(
t
,
r
)
=>
`
${
operationMap
[
r
.
operation
][
'operator'
]}
${
t
.
toFixed
(
2
)}
`
},
},
{
{
title
:
'交易项目'
,
title
:
'交易项目'
,
dataIndex
:
'operation'
,
dataIndex
:
'operation'
,
key
:
'operation'
,
key
:
'operation'
,
render
:
(
t
,
r
)
=>
operationMap
[
t
]
render
:
(
t
,
r
)
=>
operationMap
[
t
]
[
'title'
]
},
},
{
{
title
:
'状态'
,
title
:
'状态'
,
...
@@ -107,8 +108,8 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -107,8 +108,8 @@ const AccountDetail: React.FC<{}> = () => {
},
},
{
{
title
:
'操作角色'
,
title
:
'操作角色'
,
dataIndex
:
'parentMemberRoleName'
,
dataIndex
:
[
'memberAssetAccount'
,
'parentMemberRoleName'
]
,
key
:
'
parentMemberRoleName
'
,
key
:
'
id
'
,
},
},
{
{
title
:
'状态'
,
title
:
'状态'
,
...
@@ -138,7 +139,6 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -138,7 +139,6 @@ const AccountDetail: React.FC<{}> = () => {
];
];
const
handleConfirm
=
()
=>
{
const
handleConfirm
=
()
=>
{
setIsBtnLoading
(
true
)
schemaActions
.
submit
()
schemaActions
.
submit
()
}
}
...
@@ -148,6 +148,7 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -148,6 +148,7 @@ const AccountDetail: React.FC<{}> = () => {
const
handleSubmit
=
(
value
)
=>
{
const
handleSubmit
=
(
value
)
=>
{
// 提交重置
// 提交重置
setIsBtnLoading
(
true
)
let
parasm
=
{
let
parasm
=
{
memberAssetAccountId
:
pageId
,
memberAssetAccountId
:
pageId
,
money
:
Number
(
value
.
money
),
money
:
Number
(
value
.
money
),
...
@@ -188,7 +189,7 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -188,7 +189,7 @@ const AccountDetail: React.FC<{}> = () => {
</
div
>
</
div
>
<
div
className=
{
styles
[
'repayment-end'
]
}
>
<
div
className=
{
styles
[
'repayment-end'
]
}
>
<
span
className=
{
styles
[
'repayment-time'
]
}
>
<
span
className=
{
styles
[
'repayment-time'
]
}
>
{
details
?.
m
emberName
}
{
details
?.
parentM
emberName
}
</
span
>
</
span
>
</
div
>
</
div
>
</
div
>
</
div
>
...
...
src/pages/payandSettle/capitalAccounts/accountLists/applyWithdraw.tsx
View file @
c549a696
...
@@ -31,7 +31,7 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -31,7 +31,7 @@ const AccountDetail: React.FC<{}> = () => {
let
res
=
await
PublicApi
.
getPayAssetAccountGetAssetAccount
({
id
})
let
res
=
await
PublicApi
.
getPayAssetAccountGetAssetAccount
({
id
})
const
{
code
,
data
}
=
res
const
{
code
,
data
}
=
res
setDetails
(
data
)
setDetails
(
data
)
if
(
code
===
1000
){
if
(
code
===
1000
)
{
let
bankRes
=
await
PublicApi
.
getSettleAccountsCorporateAccountConfig
({
memberId
:
data
.
memberId
+
''
})
let
bankRes
=
await
PublicApi
.
getSettleAccountsCorporateAccountConfig
({
memberId
:
data
.
memberId
+
''
})
setBankDetail
(
bankRes
.
data
)
setBankDetail
(
bankRes
.
data
)
}
}
...
@@ -62,12 +62,13 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -62,12 +62,13 @@ const AccountDetail: React.FC<{}> = () => {
title
:
'交易金额(元)'
,
title
:
'交易金额(元)'
,
dataIndex
:
'tradeMoney'
,
dataIndex
:
'tradeMoney'
,
key
:
'tradeMoney'
,
key
:
'tradeMoney'
,
render
:
(
t
,
r
)
=>
`
${
operationMap
[
r
.
operation
][
'operator'
]}
${
t
.
toFixed
(
2
)}
`
},
},
{
{
title
:
'交易项目'
,
title
:
'交易项目'
,
dataIndex
:
'operation'
,
dataIndex
:
'operation'
,
key
:
'operation'
,
key
:
'operation'
,
render
:
(
t
,
r
)
=>
operationMap
[
t
]
render
:
(
t
,
r
)
=>
operationMap
[
t
]
[
'title'
]
},
},
{
{
title
:
'状态'
,
title
:
'状态'
,
...
...
src/pages/payandSettle/capitalAccounts/accountLists/index.less
View file @
c549a696
...
@@ -41,20 +41,20 @@
...
@@ -41,20 +41,20 @@
font-weight: 500;
font-weight: 500;
}
}
&-input {
&-input {
display: block;
display: block
!important
;
width: 180px;
width: 180px
!important
;
line-height: 40px;
line-height: 40px
!important
;
padding: 8px 0;
padding: 8px 0
!important
;
font-size: 32px;
font-size: 32px
!important
;
font-weight: 500;
font-weight: 500
!important
;
color: #fff;
color: #fff
!important
;
background: none;
background: none
!important
;
border-top: none;
border-top: none
!important
;
border-right: none;
border-right: none
!important
;
border-left: none;
border-left: none
!important
;
border-image: initial;
border-image: initial
!important
;
outline: none;
outline: none
!important
;
border-bottom: 1px solid #fff;
border-bottom: 1px solid #fff
!important
;
}
}
}
}
...
...
src/pages/payandSettle/capitalAccounts/accountLists/index.tsx
View file @
c549a696
...
@@ -12,7 +12,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
...
@@ -12,7 +12,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
import
EyePreview
from
'@/components/EyePreview'
import
EyePreview
from
'@/components/EyePreview'
import
{
DatePicker
}
from
'@formily/antd-components'
import
{
DatePicker
}
from
'@formily/antd-components'
import
StatusTag
from
'@/components/StatusTag'
import
StatusTag
from
'@/components/StatusTag'
import
{
accountStatusMap
,
memberStatusMap
,
memberLevelTypeMap
}
from
'../../constant'
import
{
accountStatusMap
,
memberStatusMap
,
memberLevelTypeMap
,
accountMemberType
}
from
'../../constant'
import
LevelBrand
from
'@/pages/member/components/LevelBrand'
import
LevelBrand
from
'@/pages/member/components/LevelBrand'
const
formActions
=
createFormActions
();
const
formActions
=
createFormActions
();
...
@@ -23,8 +23,8 @@ const AccountLists: React.FC<{}> = () => {
...
@@ -23,8 +23,8 @@ const AccountLists: React.FC<{}> = () => {
const
columns
:
ColumnType
<
any
>
[]
=
[
const
columns
:
ColumnType
<
any
>
[]
=
[
{
{
title
:
'账户归属'
,
title
:
'账户归属'
,
dataIndex
:
'
m
emberName'
,
dataIndex
:
'
parentM
emberName'
,
key
:
'
m
emberName'
,
key
:
'
parentM
emberName'
,
className
:
'commonPickColor'
,
className
:
'commonPickColor'
,
render
:
(
text
,
record
)
=>
<
EyePreview
render
:
(
text
,
record
)
=>
<
EyePreview
url=
{
`/memberCenter/payandSettle/capitalAccounts/accountLists/detail?id=${record.id}`
}
url=
{
`/memberCenter/payandSettle/capitalAccounts/accountLists/detail?id=${record.id}`
}
...
@@ -34,8 +34,9 @@ const AccountLists: React.FC<{}> = () => {
...
@@ -34,8 +34,9 @@ const AccountLists: React.FC<{}> = () => {
},
},
{
{
title
:
'会员类型'
,
title
:
'会员类型'
,
dataIndex
:
'memberTypeName'
,
dataIndex
:
'memberType'
,
key
:
'memberTypeName'
,
key
:
'memberType'
,
render
:
(
t
,
r
)
=>
accountMemberType
[
t
]
},
},
{
{
title
:
'会员角色'
,
title
:
'会员角色'
,
...
...
src/pages/payandSettle/constant.ts
View file @
c549a696
...
@@ -130,9 +130,17 @@ export const memberLevelTypeMap = {
...
@@ -130,9 +130,17 @@ export const memberLevelTypeMap = {
// 操作项目
// 操作项目
export
const
operationMap
=
{
export
const
operationMap
=
{
'1'
:
'账户充值'
,
'1'
:
{
title
:
'账户充值'
,
operator
:
'+'
},
'2'
:
'账户提现'
,
'2'
:
{
title
:
'账户提现'
,
operator
:
'-'
},
'3'
:
'订单支付'
,
'3'
:
{
title
:
'订单支付'
,
operator
:
'-'
},
'4'
:
'订单退款'
,
'4'
:
{
title
:
'订单退款'
,
operator
:
'+'
},
'5'
:
'订单返利'
'5'
:
{
title
:
'订单返利'
,
operator
:
'+'
}
}
// 会员类型
export
const
accountMemberType
=
{
'1'
:
'企业会员'
,
'2'
:
'企业个人会员'
,
'3'
:
'渠道会员'
,
'4'
:
'渠道个人会员'
,
}
}
\ No newline at end of file
src/pages/payandSettle/creditApplication/components/DetailInfo/index.tsx
View file @
c549a696
...
@@ -13,10 +13,11 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
...
@@ -13,10 +13,11 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import
{
history
}
from
'umi'
;
import
{
history
}
from
'umi'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
GetPayCreditApplyGetApplyDetailResponse
}
from
'@/services/PayApi'
;
import
{
GetPayCreditApplyGetApplyDetailResponse
}
from
'@/services/PayApi'
;
import
{
CREDIT_INNER_STATUS
,
CREDIT_OUTER_STATUS
}
from
'@/constants'
;
import
{
CREDIT_INNER_STATUS
,
CREDIT_OUTER_STATUS
,
CREDIT_STATUS
}
from
'@/constants'
;
import
AvatarWrap
from
'@/components/AvatarWrap'
;
import
AvatarWrap
from
'@/components/AvatarWrap'
;
import
StatusTag
from
'@/components/StatusTag'
;
import
StatusTag
from
'@/components/StatusTag'
;
import
{
CREDIT_STATUS_TAG_MAP
,
CREDIT_OUTER_STATUS_TAG_MAP
,
CREDIT_OUTER_STATUS_BADGE_MAP
}
from
'../../../constant'
;
import
{
CREDIT_STATUS_TAG_MAP
,
CREDIT_OUTER_STATUS_TAG_MAP
,
CREDIT_OUTER_STATUS_BADGE_MAP
}
from
'../../../constant'
;
import
{
normalizeFiledata
,
FileData
}
from
'@/utils'
;
const
OuterCirculation
=
React
.
lazy
(()
=>
import
(
'../OuterCirculation'
));
const
OuterCirculation
=
React
.
lazy
(()
=>
import
(
'../OuterCirculation'
));
const
QuotaApplicationInfo
=
React
.
lazy
(()
=>
import
(
'../QuotaApplicationInfo'
));
const
QuotaApplicationInfo
=
React
.
lazy
(()
=>
import
(
'../QuotaApplicationInfo'
));
...
@@ -41,6 +42,8 @@ interface QuotaValues {
...
@@ -41,6 +42,8 @@ interface QuotaValues {
billDay
:
number
|
null
;
billDay
:
number
|
null
;
// 申请还款周期
// 申请还款周期
repayPeriod
:
number
|
null
;
repayPeriod
:
number
|
null
;
// 申请附件
fileList
:
FileData
[];
};
};
const
DetailInfo
:
React
.
FC
<
DetailInfoProps
>
=
({
const
DetailInfo
:
React
.
FC
<
DetailInfoProps
>
=
({
...
@@ -54,24 +57,28 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
...
@@ -54,24 +57,28 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
applyQuota
:
null
,
applyQuota
:
null
,
billDay
:
null
,
billDay
:
null
,
repayPeriod
:
null
,
repayPeriod
:
null
,
fileList
:
[],
});
});
const
[
infoLoading
,
setInfoloading
]
=
useState
(
false
);
const
[
infoLoading
,
setInfoloading
]
=
useState
(
false
);
const
[
submitLoading
,
setSubmitLoading
]
=
useState
(
false
);
const
[
submitLoading
,
setSubmitLoading
]
=
useState
(
false
);
// 获取授信详情
const
getQuotaInfo
=
()
=>
{
const
getQuotaInfo
=
()
=>
{
if
(
!
id
)
{
if
(
!
id
)
{
return
;
return
;
}
}
setInfoloading
(
true
);
setInfoloading
(
true
);
PublicApi
.
getPayCreditApplyGetApplyDetail
({
PublicApi
.
getPayCreditApplyGetApplyDetail
({
id
,
applyId
:
id
,
creditId
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setQuotaInfo
(
res
.
data
);
setQuotaInfo
(
res
.
data
);
setQuotaValues
({
setQuotaValues
({
applyQuota
:
res
.
data
.
applyQuota
,
applyQuota
:
res
.
data
.
apply
.
applyQuota
,
billDay
:
res
.
data
.
billDay
,
billDay
:
res
.
data
.
apply
.
billDay
,
repayPeriod
:
res
.
data
.
repayPeriod
,
repayPeriod
:
res
.
data
.
apply
.
repayPeriod
,
fileList
:
res
.
data
.
apply
.
fileList
?
res
.
data
.
apply
.
fileList
.
map
(
item
=>
normalizeFiledata
(
item
.
fileUrl
))
:
[],
});
});
}
}
}).
finally
(()
=>
{
}).
finally
(()
=>
{
...
@@ -90,10 +97,13 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
...
@@ -90,10 +97,13 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const
handleSubmit
=
()
=>
{
const
handleSubmit
=
()
=>
{
setSubmitLoading
(
true
);
setSubmitLoading
(
true
);
const
{
fileList
,
...
rest
}
=
quotaValues
;
PublicApi
.
postPayCreditApplyAddCreditApply
({
PublicApi
.
postPayCreditApplyAddCreditApply
({
applyId
:
+
id
,
applyId
:
+
id
,
creditId
:
creditId
?
+
creditId
:
0
,
creditId
:
creditId
?
+
creditId
:
0
,
...
quotaValues
,
fileList
:
fileList
.
map
(
item
=>
({
name
:
item
.
name
,
fileUrl
:
item
.
url
})),
...
rest
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
...
@@ -117,7 +127,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
...
@@ -117,7 +127,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
AvatarWrap
<
AvatarWrap
info=
{
{
info=
{
{
aloneTxt
:
'单'
,
aloneTxt
:
'单'
,
name
:
`申请单号:${quotaInfo && quotaInfo.
applyNo ? quotaInfo
.applyNo : ''}`
,
name
:
`申请单号:${quotaInfo && quotaInfo.
member ? quotaInfo.member
.applyNo : ''}`
,
}
}
}
}
extra=
{
quotaInfo
&&
quotaInfo
.
member
?
quotaInfo
.
member
.
levelTag
||
''
:
''
}
extra=
{
quotaInfo
&&
quotaInfo
.
member
?
quotaInfo
.
member
.
levelTag
||
''
:
''
}
/>
/>
...
@@ -143,20 +153,20 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
...
@@ -143,20 +153,20 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
padding
:
'0 32px'
,
padding
:
'0 32px'
,
}
}
}
}
>
>
<
Descriptions
.
Item
label=
"会员归属"
>
{
'暂无'
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"会员归属"
>
{
quotaInfo
?.
member
?.
parentMemberName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"会员类型"
>
{
quotaInfo
?.
member
?.
memberTypeName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"会员类型"
>
{
quotaInfo
?.
member
?.
memberTypeName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"会员角色名称"
>
{
quotaInfo
?.
member
?.
roleName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"会员角色名称"
>
{
quotaInfo
?.
member
?.
roleName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"会员状态"
>
<
Descriptions
.
Item
label=
"会员状态"
>
<
StatusTag
<
StatusTag
type=
{
CREDIT_STATUS_TAG_MAP
[
quotaInfo
&&
quotaInfo
.
member
?
quotaInfo
.
member
.
status
||
1
:
1
]
}
type=
{
CREDIT_STATUS_TAG_MAP
[
quotaInfo
&&
quotaInfo
.
member
?
quotaInfo
.
member
.
status
:
'default'
]
}
title=
{
quotaInfo
&&
quotaInfo
.
member
?
quotaInfo
.
member
.
status
||
1
:
1
}
title=
{
quotaInfo
&&
quotaInfo
.
member
?
CREDIT_STATUS
[
quotaInfo
.
member
.
status
]
:
''
}
/>
/>
</
Descriptions
.
Item
>
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"外部状态"
>
<
Descriptions
.
Item
label=
"外部状态"
>
<
StatusTag
type=
{
CREDIT_OUTER_STATUS_TAG_MAP
[
quotaInfo
?.
outerStatus
]
}
title=
{
CREDIT_OUTER_STATUS
[
quotaInfo
?
.
outerStatus
]
}
/>
<
StatusTag
type=
{
CREDIT_OUTER_STATUS_TAG_MAP
[
quotaInfo
?.
member
.
outerStatus
]
}
title=
{
CREDIT_OUTER_STATUS
[
quotaInfo
?.
member
.
outerStatus
]
}
/>
</
Descriptions
.
Item
>
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"内部状态"
>
<
Descriptions
.
Item
label=
"内部状态"
>
<
Badge
color=
{
CREDIT_OUTER_STATUS_BADGE_MAP
[
quotaInfo
?.
innerStatus
]
}
text=
{
CREDIT_INNER_STATUS
[
quotaInfo
?
.
innerStatus
]
}
/>
<
Badge
color=
{
CREDIT_OUTER_STATUS_BADGE_MAP
[
quotaInfo
?.
member
.
innerStatus
]
}
text=
{
CREDIT_INNER_STATUS
[
quotaInfo
?.
member
.
innerStatus
]
}
/>
</
Descriptions
.
Item
>
</
Descriptions
.
Item
>
</
Descriptions
>
</
Descriptions
>
</
PageHeader
>
</
PageHeader
>
...
@@ -166,25 +176,26 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
...
@@ -166,25 +176,26 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
Suspense
fallback=
{
null
}
>
<
Suspense
fallback=
{
null
}
>
<
OuterCirculation
<
OuterCirculation
steps=
{
steps=
{
quotaInfo
&&
quotaInfo
.
outer
VerifyRecord
List
?
quotaInfo
&&
quotaInfo
.
outer
Task
List
?
quotaInfo
.
outer
VerifyRecord
List
.
map
(
item
=>
({
quotaInfo
.
outer
Task
List
.
map
(
item
=>
({
title
:
item
.
operat
e
,
title
:
item
.
taskNam
e
,
description
:
item
.
roleName
,
description
:
item
.
roleName
,
}))
:
}))
:
[]
[]
}
}
current=
{
0
}
current=
{
quotaInfo
&&
quotaInfo
.
outerTaskList
?
quotaInfo
&&
quotaInfo
.
outerTaskList
.
findIndex
(
item
=>
item
.
isExecute
===
0
)
:
0
}
/>
/>
</
Suspense
>
</
Suspense
>
<
Suspense
fallback=
{
null
}
>
<
Suspense
fallback=
{
null
}
>
<
QuotaApplicationInfo
<
QuotaApplicationInfo
quotaInfo=
{
{
quotaInfo=
{
{
originalQuota
:
quotaInfo
?.
originalQuota
,
originalQuota
:
quotaInfo
?.
apply
.
originalQuota
,
applyQuota
:
quotaValues
.
applyQuota
,
applyQuota
:
quotaValues
.
applyQuota
,
billDay
:
quotaValues
.
billDay
,
billDay
:
quotaValues
.
billDay
,
repayPeriod
:
quotaValues
.
repayPeriod
,
repayPeriod
:
quotaValues
.
repayPeriod
,
applyTime
:
quotaInfo
?.
applyTime
,
applyTime
:
quotaInfo
?.
apply
.
applyTime
,
fileList
:
quotaValues
.
fileList
,
}
}
}
}
verify=
{
verify=
{
quotaInfo
&&
quotaInfo
.
verify
?
{
quotaInfo
&&
quotaInfo
.
verify
?
{
...
...
src/pages/payandSettle/creditApplication/components/QuotaApplicationInfo/index.tsx
View file @
c549a696
...
@@ -11,6 +11,7 @@ import {
...
@@ -11,6 +11,7 @@ import {
}
from
'antd'
;
}
from
'antd'
;
import
{
FormOutlined
,
RightCircleFilled
}
from
'@ant-design/icons'
;
import
{
FormOutlined
,
RightCircleFilled
}
from
'@ant-design/icons'
;
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
FileData
}
from
'@/utils'
;
import
MellowCard
from
'@/components/MellowCard'
;
import
MellowCard
from
'@/components/MellowCard'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
{
editModalSchema
}
from
'./schema'
;
import
{
editModalSchema
}
from
'./schema'
;
...
@@ -33,8 +34,10 @@ interface QuotaApplicationInfo {
...
@@ -33,8 +34,10 @@ interface QuotaApplicationInfo {
billDay
:
number
,
billDay
:
number
,
// 申请还款周期
// 申请还款周期
repayPeriod
:
number
,
repayPeriod
:
number
,
//
//
申请时间
// 申请时间
applyTime
:
string
,
applyTime
:
string
,
// 申请附件
fileList
:
FileData
[];
},
},
// 授信审批信息
// 授信审批信息
verify
:
{
verify
:
{
...
@@ -189,26 +192,7 @@ const QuotaApplicationInfo: React.FC<QuotaApplicationInfo> = ({
...
@@ -189,26 +192,7 @@ const QuotaApplicationInfo: React.FC<QuotaApplicationInfo> = ({
</
div
>
</
div
>
<
Upload
<
Upload
defaultFileList=
{
[
fileList=
{
quotaInfo
.
fileList
}
{
uid
:
'1'
,
name
:
'xxx.png'
,
status
:
'done'
,
url
:
'http://www.baidu.com/xxx.png'
,
},
{
uid
:
'2'
,
name
:
'yyy.png'
,
status
:
'done'
,
url
:
'http://www.baidu.com/yyy.png'
,
},
{
uid
:
'3'
,
name
:
'zzz.png'
,
status
:
'done'
,
url
:
'http://www.baidu.com/zzz.png'
,
},
]
}
disabled
disabled
/>
/>
</
Col
>
</
Col
>
...
@@ -261,6 +245,7 @@ const QuotaApplicationInfo: React.FC<QuotaApplicationInfo> = ({
...
@@ -261,6 +245,7 @@ const QuotaApplicationInfo: React.FC<QuotaApplicationInfo> = ({
>
>
<
NiceForm
<
NiceForm
previewPlaceholder=
""
previewPlaceholder=
""
initialValues=
{
quotaInfo
}
effects=
{
(
$
,
actions
)
=>
{
effects=
{
(
$
,
actions
)
=>
{
const
{
setFieldState
,
setFieldValue
}
=
actions
;
const
{
setFieldState
,
setFieldValue
}
=
actions
;
...
...
src/pages/payandSettle/creditApplication/components/QuotaApplicationInfo/schema/index.ts
View file @
c549a696
...
@@ -101,7 +101,7 @@ export const editModalSchema: ISchema = {
...
@@ -101,7 +101,7 @@ export const editModalSchema: ISchema = {
},
},
],
],
},
},
attachmen
t
:
{
fileLis
t
:
{
type
:
'string'
,
type
:
'string'
,
title
:
'申请附件'
,
title
:
'申请附件'
,
'x-component'
:
'Upload'
,
'x-component'
:
'Upload'
,
...
@@ -112,7 +112,7 @@ export const editModalSchema: ISchema = {
...
@@ -112,7 +112,7 @@ export const editModalSchema: ISchema = {
prefix
:
'/creditApplication/applicationAttachment/'
,
prefix
:
'/creditApplication/applicationAttachment/'
,
},
},
beforeUpload
:
'{{beforeUpload}}'
,
beforeUpload
:
'{{beforeUpload}}'
,
accept
:
'.
png, .jp
g, .jpeg'
,
accept
:
'.
xls, .xlsx, .doc, .docx, .wps, .pdf, .jpg, .pn
g, .jpeg'
,
},
},
'x-rules'
:
[
'x-rules'
:
[
{
{
...
...
src/pages/payandSettle/creditApplication/quotaFormQuery/index.tsx
View file @
c549a696
...
@@ -36,7 +36,7 @@ const QuotaFormQuery: React.FC = () => {
...
@@ -36,7 +36,7 @@ const QuotaFormQuery: React.FC = () => {
render
:
(
text
,
record
)
=>
(
render
:
(
text
,
record
)
=>
(
<>
<>
<
EyePreview
<
EyePreview
url=
{
`/memberCenter/payandSettle/creditApplication/quotaFormQuery/detail?id=${record.id}`
}
url=
{
`/memberCenter/payandSettle/creditApplication/quotaFormQuery/detail?id=${record.id}
&creditId=${record.creditId}
`
}
>
>
{
text
}
{
text
}
</
EyePreview
>
</
EyePreview
>
...
...
src/pages/payandSettle/creditApplication/quotaMenage/apply.tsx
View file @
c549a696
...
@@ -3,11 +3,11 @@ import { usePageStatus } from '@/hooks/usePageStatus';
...
@@ -3,11 +3,11 @@ import { usePageStatus } from '@/hooks/usePageStatus';
import
DetailInfo
from
'../components/DetailInfo'
;
import
DetailInfo
from
'../components/DetailInfo'
;
const
QuotaMenageApply
:
React
.
FC
=
()
=>
{
const
QuotaMenageApply
:
React
.
FC
=
()
=>
{
const
{
i
d
,
creditId
}
=
usePageStatus
();
const
{
applyI
d
,
creditId
}
=
usePageStatus
();
return
(
return
(
<
DetailInfo
<
DetailInfo
id=
{
i
d
}
id=
{
applyI
d
}
creditId=
{
creditId
}
creditId=
{
creditId
}
target=
"/memberCenter/payandSettle/creditApplication/quotaMenage/history"
target=
"/memberCenter/payandSettle/creditApplication/quotaMenage/history"
isEdit
isEdit
...
...
src/pages/payandSettle/creditApplication/quotaMenage/detail/components/IntroduceRow/index.tsx
View file @
c549a696
...
@@ -67,6 +67,10 @@ export interface BillDetailData {
...
@@ -67,6 +67,10 @@ export interface BillDetailData {
* 最后还款日期
* 最后还款日期
*/
*/
lastRepayDate
:
string
lastRepayDate
:
string
/**
* 收款人Id
*/
memberId
:
number
};
};
export
interface
BillRecordParams
extends
RecordParams
{
export
interface
BillRecordParams
extends
RecordParams
{
...
@@ -162,7 +166,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
...
@@ -162,7 +166,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
id
:
`
${
id
}
`
,
id
:
`
${
id
}
`
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
this
.
setState
({
billInfo
:
res
});
this
.
setState
({
billInfo
:
res
});
// this.getSettleAccountsCorporateAccountConfig(
);
this
.
getSettleAccountsCorporateAccountConfig
(
res
.
memberId
);
}).
finally
(()
=>
{
}).
finally
(()
=>
{
this
.
setState
({
billInfoLoading
:
false
});
this
.
setState
({
billInfoLoading
:
false
});
});
});
...
@@ -170,7 +174,10 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
...
@@ -170,7 +174,10 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
};
};
// 获取对公账户信息
// 获取对公账户信息
getSettleAccountsCorporateAccountConfig
=
(
payee
:
string
)
=>
{
getSettleAccountsCorporateAccountConfig
=
(
payee
:
number
)
=>
{
if
(
!
payee
)
{
return
;
}
PublicApi
.
getSettleAccountsCorporateAccountConfig
({
PublicApi
.
getSettleAccountsCorporateAccountConfig
({
memberId
:
payee
,
memberId
:
payee
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
...
@@ -256,7 +263,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
...
@@ -256,7 +263,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
const
{
payProveList
}
=
values
;
const
{
payProveList
}
=
values
;
const
{
repaymentValues
,
billId
,
bankAccount
}
=
this
.
state
;
const
{
repaymentValues
,
billId
,
bankAccount
}
=
this
.
state
;
if
(
!
bankAccount
.
id
||
!
bankAccount
.
memberId
)
{
if
(
!
bankAccount
||
!
bankAccount
.
id
||
!
bankAccount
.
memberId
)
{
message
.
error
(
'没有还款账户相关信息,无法还款'
);
message
.
error
(
'没有还款账户相关信息,无法还款'
);
return
;
return
;
}
}
...
...
src/pages/payandSettle/creditApplication/quotaMenage/index.tsx
View file @
c549a696
...
@@ -35,7 +35,7 @@ const QuotaMenage: React.FC = () => {
...
@@ -35,7 +35,7 @@ const QuotaMenage: React.FC = () => {
const
handleJumpApply
=
record
=>
{
const
handleJumpApply
=
record
=>
{
// 跳转申请页面
// 跳转申请页面
history
.
push
(
`/memberCenter/payandSettle/creditApplication/quotaMenage/apply?
id=
${
record
.
id
}
`
);
history
.
push
(
`/memberCenter/payandSettle/creditApplication/quotaMenage/apply?
creditId=
${
record
.
id
}
&applyId=0
`
);
};
};
const
defaultColumns
:
ColumnType
<
any
>
[]
=
[
const
defaultColumns
:
ColumnType
<
any
>
[]
=
[
...
...
src/pages/transaction/common/tableStatusList.tsx
View file @
c549a696
...
@@ -72,6 +72,7 @@ export const enquirySearchexternalState = (text:any) => {
...
@@ -72,6 +72,7 @@ export const enquirySearchexternalState = (text:any) => {
/****** *********************** 报价单 ************************** */
/****** *********************** 报价单 ************************** */
//内部
//内部
// 内部状态:1.新增需求单 2.审核需求单一级 3.审核需求单二级 4.提交需求单 5.完成 6.审核不通过 7.取消报价单
export
const
enquiryOfferSearchInteriorState
=
(
text
:
any
)
=>
{
export
const
enquiryOfferSearchInteriorState
=
(
text
:
any
)
=>
{
let
component
:
ReactNode
=
null
;
let
component
:
ReactNode
=
null
;
text
===
1
?
component
=
<
Badge
status=
'default'
text=
"新增报价单"
/>:
text
===
1
?
component
=
<
Badge
status=
'default'
text=
"新增报价单"
/>:
...
@@ -94,6 +95,7 @@ export const enquiryOfferSearchexternalState = (text:any) => {
...
@@ -94,6 +95,7 @@ export const enquiryOfferSearchexternalState = (text:any) => {
// text === 5 ? component = <Badge status='success' text="完成" />:
// text === 5 ? component = <Badge status='success' text="完成" />:
// text === 6 ? component = <Badge status='error' text="审核不通过" />:
// text === 6 ? component = <Badge status='error' text="审核不通过" />:
// component = <Badge status="default" text="取消报价单" />
// component = <Badge status="default" text="取消报价单" />
// 外部状态:1.提交需求单 2.审核需求单 3.提交报价单 4.确认报价单 5.完成 6.审核不通过 7.取消报价单
text
===
1
?
component
=
<
span
style=
{
statuStyle
.
default
}
>
待提交需求单
</
span
>:
text
===
1
?
component
=
<
span
style=
{
statuStyle
.
default
}
>
待提交需求单
</
span
>:
text
===
2
?
component
=
<
span
style=
{
statuStyle
.
default
}
>
审核需求单
</
span
>:
text
===
2
?
component
=
<
span
style=
{
statuStyle
.
default
}
>
审核需求单
</
span
>:
text
===
3
?
component
=
<
span
style=
{
statuStyle
.
confirm
}
>
待提交报价单
</
span
>:
text
===
3
?
component
=
<
span
style=
{
statuStyle
.
confirm
}
>
待提交报价单
</
span
>:
...
...
src/pages/transaction/enquiryOffer/components/detail.tsx
View file @
c549a696
This diff is collapsed.
Click to expand it.
src/pages/transaction/enquiryOffer/components/index.tsx
View file @
c549a696
This diff is collapsed.
Click to expand it.
src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx
View file @
c549a696
...
@@ -862,7 +862,8 @@ const Detail: React.FC<{}> = () => {
...
@@ -862,7 +862,8 @@ const Detail: React.FC<{}> = () => {
otherList
.
forEach
(
j
=>
{
otherList
.
forEach
(
j
=>
{
let
otherItem
:
any
=
{}
let
otherItem
:
any
=
{}
if
(
child
===
j
.
title
)
{
if
(
child
===
j
.
title
)
{
otherItem
[
child
]
=
v
[
child
]
otherItem
[
child
]
=
v
[
child
].
split
(
'/'
);
console
.
log
(
v
[
child
],
'我要这里做修改'
)
_otherList
.
push
(
otherItem
)
_otherList
.
push
(
otherItem
)
}
}
})
})
...
...
src/store/product/index.ts
View file @
c549a696
...
@@ -16,6 +16,7 @@ class ProductStore implements IProductModule {
...
@@ -16,6 +16,7 @@ class ProductStore implements IProductModule {
@
observable
public
productDescription
:
IDecsParams
;
@
observable
public
productDescription
:
IDecsParams
;
@
observable
public
isAllAttributePic
:
boolean
=
true
;
// 是否所有属性共用
@
observable
public
isAllAttributePic
:
boolean
=
true
;
// 是否所有属性共用
@
observable
public
currentPageInStore
:
IPage
=
{
current
:
null
,
pageSize
:
null
};
// 页码相关
@
observable
public
currentPageInStore
:
IPage
=
{
current
:
null
,
pageSize
:
null
};
// 页码相关
@
observable
public
tabClickItem
:
any
[]
=
[];
// tab标签页点击项
/** 计算操作 **/
/** 计算操作 **/
// 加工接口返回的数据,用户编辑回显数据
// 加工接口返回的数据,用户编辑回显数据
...
@@ -193,6 +194,10 @@ class ProductStore implements IProductModule {
...
@@ -193,6 +194,10 @@ class ProductStore implements IProductModule {
this
.
currentPageInStore
=
data
this
.
currentPageInStore
=
data
}
}
@
action
.
bound
public
setTabClickItem
(
data
:
any
)
{
this
.
tabClickItem
=
data
}
}
}
...
...
src/utils/index.tsx
View file @
c549a696
...
@@ -445,7 +445,6 @@ export interface FileData {
...
@@ -445,7 +445,6 @@ export interface FileData {
};
};
// 初始化 Upload 数据
// 初始化 Upload 数据
export
function
normalizeFiledata
<
T
>
(
url
:
T
):
T
export
function
normalizeFiledata
(
url
:
string
):
FileData
export
function
normalizeFiledata
(
url
:
string
):
FileData
export
function
normalizeFiledata
(
url
:
any
):
any
{
export
function
normalizeFiledata
(
url
:
any
):
any
{
if
(
!
url
)
{
if
(
!
url
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment