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
黄庭坚
jinfa-platform
Commits
f262b256
Commit
f262b256
authored
Jan 12, 2022
by
Bill
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
7164a1cd
1faf6ec5
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
101 additions
and
18 deletions
+101
-18
memberDetail.tsx
src/pages/authConfig/memberSystem/memberDetail.tsx
+41
-7
index.tsx
src/pages/balance/businessReconciliation/detail/index.tsx
+2
-2
add.tsx
src/pages/balance/businessReconciliation/readyAdd/add.tsx
+38
-4
index.tsx
...ance/businessReconciliation/readyReconciliation/index.tsx
+4
-0
index.tsx
...nciliationCollaboration/components/modalOperate/index.tsx
+1
-1
index.tsx
...ance/businessReconciliationCollaboration/detail/index.tsx
+2
-2
index.tsx
...usinessReconciliationCollaboration/readyConfirm/index.tsx
+1
-1
add.tsx
src/pages/balance/businessRequestFunds/admin/add.tsx
+6
-0
index.tsx
src/pages/balance/components/WriteOffDrawer/index.tsx
+6
-1
No files found.
src/pages/authConfig/memberSystem/memberDetail.tsx
View file @
f262b256
...
...
@@ -117,6 +117,7 @@ const MemberDetail: React.FC<{}> = () => {
}),
});
const
actionRef
=
useRef
<
any
>
({});
const
formInitValue
=
nodeRecord
?
getButtonAuth
(
nodeRecord
.
key
)
:
{};
const
[
errors
,
setErrors
]
=
useState
<
boolean
>
(
false
);
...
...
@@ -126,7 +127,7 @@ const MemberDetail: React.FC<{}> = () => {
const
[
buttonInfos
,
setButtonInfos
]
=
useState
<
any
>
([]);
// 储存的数据权限选项
const
[
authInfos
,
setAuthInfos
]
=
useState
<
any
>
({});
const
[
plateformTreeList
,
setplateformTreeList
]
=
useState
<
any
>
([])
// 存储默认勾选的id
const
[
checkIds
,
setcheckIds
]
=
useState
<
any
>
({});
const
modalRef
=
useRef
<
any
>
({})
...
...
@@ -157,6 +158,11 @@ const MemberDetail: React.FC<{}> = () => {
menuId
:
node
?
node
.
id
:
nodeRecord
.
id
,
...
params
,
});
if
(
!
isAdd
&&
data
.
orgIds
)
{
let
plateformTreeDataList
=
mapkey
(
plateformTreeData
,
data
.
orgIds
)
setplateformTreeList
(
plateformTreeDataList
)
}
setButtonAuth
(
node
.
id
,
data
);
// 该配置由pass平台控制, 如果为1 则表示该角色可以配置数据权限
...
...
@@ -382,12 +388,33 @@ const MemberDetail: React.FC<{}> = () => {
</
Space
>
);
const
mapkey
=
(
plateformTreeData
:
any
,
selectKeys
:
any
)
=>
{
let
plateformTreeDataList
=
[];
plateformTreeData
.
map
((
item
:
any
)
=>
{
if
(
selectKeys
.
includes
(
item
.
id
))
{
plateformTreeDataList
.
push
(
{
id
:
item
.
id
,
title
:
item
.
title
}
)
if
(
item
.
children
)
{
const
arr
=
mapkey
(
item
.
children
,
selectKeys
)
plateformTreeDataList
=
[...
plateformTreeDataList
,
...
arr
];
}
}
})
return
plateformTreeDataList
}
const
handleOrgSuccess
=
selectKeys
=>
{
console
.
log
(
selectKeys
,
'selectKeys'
)
//
console.log(selectKeys, 'selectKeys')
if
(
!
dataId
.
includes
(
nodeRecord
.
id
))
{
dataId
.
push
(
nodeRecord
.
id
)
setdataId
(
dataId
)
}
// console.log(dataId)
setAuthInfos
({
...
authInfos
,
[
nodeRecord
.
id
]:
Object
.
assign
(
...
...
@@ -395,6 +422,9 @@ const MemberDetail: React.FC<{}> = () => {
{
orgIds
:
selectKeys
},
),
});
let
plateformTreeDataList
=
mapkey
(
plateformTreeData
,
selectKeys
)
setplateformTreeList
(
plateformTreeDataList
)
// console.log(plateformTreeDataList, 'plateformTreeData')
setOrgModalVisible
(
false
);
};
const
handleOrgCancel
=
()
=>
{
...
...
@@ -507,17 +537,21 @@ const MemberDetail: React.FC<{}> = () => {
</
Checkbox
>
<
div
style=
{
{
marginTop
:
16
}
}
>
<
p
style=
{
{
color
:
'#909399'
}
}
>
{
intl
.
formatMessage
({
id
:
'authConfig.OrganizationAuthorization'
})
}
</
p
>
{
disabledCheckAuthConfig
.
orgIds
.
map
(
v
=>
{
const
node
=
getTreeNode
(
plateformTreeData
,
v
);
if
(
!
node
||
!
node
.
id
)
return
null
;
{
plateformTreeList
.
map
(
v
=>
{
//
//
{
disabledCheckAuthConfig
.
orgIds
.
map
(
v
=>
{
// const node = getTreeNode(plateformTreeData, v);
// // console.log(node, '1111')
// if (!node || !node.id) return null;
return
(
<
div
className=
"org-tag-container"
key=
{
node
.
id
}
>
<
div
className=
"org-tag-container"
key=
{
v
.
id
}
>
<
Tag
color=
{
'#F4F5F7'
}
className=
"org-tag"
>
{
node
.
title
}
{
v
.
title
}
</
Tag
>
</
div
>
);
})}
<
Button
block
type=
"dashed"
onClick=
{
handleOpenOrg
}
>
<
PlusOutlined
/>
{
intl
.
formatMessage
({
id
:
'authConfig.orientation'
})
}
</
Button
>
...
...
src/pages/balance/businessReconciliation/detail/index.tsx
View file @
f262b256
...
...
@@ -70,8 +70,8 @@ const SearchDetail = () => {
},
{
col
:
[
{
label
:
intl
.
formatMessage
({
id
:
'balance.shoukuanfang'
}),
extra
:
data
.
paye
r
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.fukuanfang'
}),
extra
:
data
.
paye
e
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.shoukuanfang'
}),
extra
:
data
.
paye
e
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.fukuanfang'
}),
extra
:
data
.
paye
r
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.faqiduizhangfang'
}),
extra
:
data
.
launchReconciliation
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.duizhangzongjine'
}),
extra
:
`¥
${
priceFormat
(
data
.
reconciliationMoneyAmount
)}
`
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.danjushijian'
}),
extra
:
data
.
createTime
,
type
:
'text'
},
...
...
src/pages/balance/businessReconciliation/readyAdd/add.tsx
View file @
f262b256
...
...
@@ -25,6 +25,8 @@ const TABLINK = [
{
id
:
'fileLayout'
,
title
:
intl
.
formatMessage
({
id
:
'balance.fujian'
}),
},
]
const
reg
=
/
(
^
[
1-9
]{1}[
0-9
]
*$
)
|
(
^
[
0-9
]
*
\.[
0-9
]{0,3}
$
)
/
const
Add
=
()
=>
{
const
{
query
:
{
...
...
@@ -77,8 +79,34 @@ const Add = () => {
}
const
basicFormCol
=
[
{
label
:
intl
.
formatMessage
({
id
:
'balance.danjuzhaiyao'
}),
name
:
'reconciliationAbstract'
,
placeholder
:
'请输入对账单摘要'
,
maxLength
:
60
,
rules
:
[{
required
:
true
,
message
:
'请输入对账单摘要'
}]
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.beizhu'
}),
name
:
'remark'
,
placeholder
:
'请输入对备注'
,
maxLength
:
120
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.danjuzhaiyao'
}),
name
:
'reconciliationAbstract'
,
placeholder
:
'请输入对账单摘要'
,
rules
:
[{
required
:
true
,
message
:
'请输入对账单摘要'
},
{
validator
:
(
_
,
value
)
=>
{
let
_str
=
value
;
_str
=
_str
.
replace
(
/
[\u
4E00-
\u
9FA5
]
/g
,
"AA"
);
if
(
_str
.
length
>
30
*
2
)
{
return
Promise
.
reject
(
new
Error
(
`最长60个字符,30个汉字`
))
}
else
{
return
Promise
.
resolve
();
}
}
}]
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.beizhu'
}),
name
:
'remark'
,
placeholder
:
'请输入对备注'
,
rules
:
[
{
validator
:
(
_
,
value
)
=>
{
let
_str
=
value
;
_str
=
_str
.
replace
(
/
[\u
4E00-
\u
9FA5
]
/g
,
"AA"
);
if
(
value
.
length
>
60
*
2
)
{
return
Promise
.
reject
(
new
Error
(
`最长120个字符`
))
}
else
{
return
Promise
.
resolve
();
}
}
}
]
},
]
const
basicFormColRight
=
[
...
...
@@ -257,7 +285,13 @@ const Add = () => {
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'balance.qingshuruduizhangshuliang'
})
},
{
validator
:
(
_
,
value
)
=>
{
return
value
>
record
.
reconciliationQuantity
?
Promise
.
reject
(
new
Error
(
'不能大于待对账数量'
))
:
Promise
.
resolve
()
if
(
!
reg
.
test
(
value
))
{
return
Promise
.
reject
(
new
Error
(
'数量需要大于0'
))
}
if
(
value
>
record
.
reconciliationQuantity
){
return
Promise
.
reject
(
new
Error
(
'不能大于待对账数量'
))
}
return
Promise
.
resolve
()
}
},
]
}
...
...
@@ -371,7 +405,7 @@ const Add = () => {
<
Form
.
Item
{
...
item
}
>
{
_editAble
?
<
Input
placeholder=
{
item
.
placeholder
}
maxLength=
{
item
.
maxLength
}
/>
:
dataSource
[
item
.
name
]
}
{
_editAble
?
<
Input
placeholder=
{
item
.
placeholder
}
/>
:
dataSource
[
item
.
name
]
}
</
Form
.
Item
>
</
Col
>
))
}
...
...
src/pages/balance/businessReconciliation/readyReconciliation/index.tsx
View file @
f262b256
...
...
@@ -148,6 +148,10 @@ const ReadyReconciliation: React.FC = () => {
key
:
'receiveQuantity'
,
dataIndex
:
'receiveQuantity'
,
},
{
title
:
'已对账数量'
,
key
:
'reconciledQuantity'
,
dataIndex
:
'reconciledQuantity'
,
},
{
title
:
intl
.
formatMessage
({
id
:
'balance.yiduizhangjine'
}),
key
:
'reconciledMoney'
,
dataIndex
:
'reconciledMoney'
,
...
...
src/pages/balance/businessReconciliationCollaboration/components/modalOperate/index.tsx
View file @
f262b256
...
...
@@ -138,7 +138,7 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
let
_str
=
value
;
_str
=
_str
.
replace
(
/
[\u
4E00-
\u
9FA5
]
/g
,
"AA"
);
if
(
_str
.
length
>
maxNumber
*
2
)
{
return
{
type
:
'error'
,
message
:
`
${intl.formatMessage({ id: 'detail.purchase.tips19' })}${maxNumber * 2}${intl.formatMessage({ id: 'detail.purchase.tips20' })},${maxNumber}${intl.formatMessage({ id: 'detail.purchase.tips18' })}
`
};
return
{
type
:
'error'
,
message
:
`
最长${maxNumber * 2}个字符,${maxNumber}个汉字
`
};
}
else
{
return
null
;
}
...
...
src/pages/balance/businessReconciliationCollaboration/detail/index.tsx
View file @
f262b256
...
...
@@ -79,8 +79,8 @@ const SearchDetail = () => {
},
{
col
:
[
{
label
:
intl
.
formatMessage
({
id
:
'balance.shoukuanfang'
}),
extra
:
data
.
paye
r
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.fukuanfang'
}),
extra
:
data
.
paye
e
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.shoukuanfang'
}),
extra
:
data
.
paye
e
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.fukuanfang'
}),
extra
:
data
.
paye
r
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.faqiduizhangfang'
}),
extra
:
data
.
launchReconciliation
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.duizhangzongjine'
}),
extra
:
`¥
${
priceFormat
(
data
.
reconciliationMoneyAmount
)}
`
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.danjushijian'
}),
extra
:
data
.
createTime
,
type
:
'text'
},
...
...
src/pages/balance/businessReconciliationCollaboration/readyConfirm/index.tsx
View file @
f262b256
...
...
@@ -78,7 +78,7 @@ const ReadyConfirm: React.FC = () => {
title
:
intl
.
formatMessage
({
id
:
'balance.caozuo'
}),
key
:
'operate'
,
dataIndex
:
'operate'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
Link
to=
{
`readyConfirm/detail?id=${record.reconciliationId}&no=${
text
}`
}
>
{
intl
.
formatMessage
({
id
:
'balance.queren'
})
}
</
Link
>
render
:
(
text
:
any
,
record
:
any
)
=>
<
Link
to=
{
`readyConfirm/detail?id=${record.reconciliationId}&no=${
record.reconciliationNo
}`
}
>
{
intl
.
formatMessage
({
id
:
'balance.queren'
})
}
</
Link
>
}];
return
(
...
...
src/pages/balance/businessRequestFunds/admin/add.tsx
View file @
f262b256
...
...
@@ -43,6 +43,9 @@ const TABLINK = [
{
id
:
'billLayout'
,
title
:
'请款明细'
},
]
const
reg
=
/
(
^
[
1-9
]{1}[
0-9
]
*$
)
|
(
^
[
0-9
]
*
\.[
0-9
]{0,3}
$
)
/
const
createMonthOrDays
=
(
number
:
number
,
type
:
string
)
=>
{
let
_list
=
[];
for
(
let
i
=
1
;
i
<=
number
;
i
++
)
{
...
...
@@ -510,6 +513,9 @@ const Add = () => {
rules=
{
[
{
validator
:
(
_
,
value
)
=>
{
if
(
!
reg
.
test
(
value
))
{
return
Promise
.
reject
(
new
Error
(
'请款金额需要大于0'
))
}
if
(
value
>
(
record
.
billAmount
-
record
.
paid
-
record
.
appliedUnpaid
))
{
return
Promise
.
reject
(
new
Error
(
'请款金额不能超过单据金额减去已付款及已请款待付款的和'
))
}
...
...
src/pages/balance/components/WriteOffDrawer/index.tsx
View file @
f262b256
...
...
@@ -16,6 +16,8 @@ interface WriteOffDrawerProps {
onOk
?:
(
rows
:
any
[])
=>
void
}
const
intl
=
getIntl
();
const
reg
=
/
(
^
[
1-9
]{1}[
0-9
]
*$
)
|
(
^
[
0-9
]
*
\.[
0-9
]{0,3}
$
)
/
const
WriteOffDrawer
:
React
.
FC
<
WriteOffDrawerProps
>
=
(
props
:
WriteOffDrawerProps
)
=>
{
const
{
visible
,
record
,
editAble
=
false
,
onClose
,
onOk
}
=
props
;
const
ref
=
useRef
<
any
>
({})
...
...
@@ -119,7 +121,10 @@ const WriteOffDrawer: React.FC<WriteOffDrawerProps> = (props: WriteOffDrawerProp
rules=
{
[
{
validator
:
(
_
,
value
)
=>
{
return
value
>
record
.
canWriteAmount
?
Promise
.
reject
(
new
Error
(
'可以核销金额'
))
:
Promise
.
resolve
()
if
(
!
reg
.
test
(
value
))
{
return
Promise
.
reject
(
new
Error
(
'本次核销金额需要大于0'
))
}
return
value
>
record
.
canWriteAmount
?
Promise
.
reject
(
new
Error
(
'本次核销金额不能大于可以核销金额'
))
:
Promise
.
resolve
()
}
},
]
}
...
...
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