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
a487d78c
Commit
a487d78c
authored
Dec 05, 2022
by
前端-陈智峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 按钮权限串台、金发bug
parent
6a3ec8f5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
8 deletions
+22
-8
index.tsx
src/components/CheckBoxTree/index.tsx
+1
-0
memberDetail.tsx
src/pages/authConfig/memberSystem/memberDetail.tsx
+10
-1
FormList.tsx
src/pages/contract/manage/add/components/FormList.tsx
+7
-6
index.tsx
...saction/purchaseRequisition/increaseRequisition/index.tsx
+4
-1
No files found.
src/components/CheckBoxTree/index.tsx
View file @
a487d78c
...
...
@@ -40,6 +40,7 @@ const CheckboxTree: React.FC<CheckboxTreeProps> = props => {
actions
.
current
.
selected
=
selected
;
actions
.
current
.
setSelected
=
setSelected
;
actions
.
current
.
getSelected
=
()
=>
selected
;
actions
.
current
.
unSelectAll
=
unSelectAll
;
}
const
toggleSelectAll
=
()
=>
{
...
...
src/pages/authConfig/memberSystem/memberDetail.tsx
View file @
a487d78c
...
...
@@ -276,8 +276,17 @@ const MemberDetail: React.FC<{}> = () => {
);
return
res
;
};
const
resset
=
()
=>
{
setNodeRecord
(
null
)
setButtonInfos
([])
actionRef
.
current
.
unSelectAll
()
setAuthInfos
({})
setcheckIds
({})
setdataId
([])
setplateformTreeList
([])
}
useEffect
(()
=>
{
resset
()
if
(
!
id
)
return
;
fetchRoleMenuDetail
(
id
,
source
).
then
(
res
=>
{
const
{
data
}
=
res
;
...
...
src/pages/contract/manage/add/components/FormList.tsx
View file @
a487d78c
...
...
@@ -164,7 +164,6 @@ const FormList = (props: any) => {
list
.
map
((
item
:
any
,
index
:
number
)
=>
{
item
.
prpIds
=
item
.
prpId
val_taxPoint
(
item
)
})
setSelectData
(
list
)
...
...
@@ -172,12 +171,15 @@ const FormList = (props: any) => {
newList
.
map
((
i
,
k
)
=>
{
i
.
newId
=
i
.
prpId
i
.
isHasTax
=
form
.
getFieldValue
(
`isHasTax
${
i
.
prpId
}
_
${
i
.
id
}
`
)
||
undefined
i
.
taxRate
=
form
.
getFieldValue
(
`taxRate
${
i
.
prpId
}
_
${
i
.
id
}
`
)
||
''
i
.
price
=
form
.
getFieldValue
(
`price
${
i
.
prpId
}
`
)
||
''
val_taxPoint
(
i
)
// i.isHasTax = form.getFieldValue(`isHasTax${i.prpId}_${i.id}`) || undefined
// i.taxRate = form.getFieldValue(`taxRate${i.prpId}_${i.id}`) || ''
// i.price = form.getFieldValue(`price${i.prpId}_${i.id}`) || ''
i
.
bidAmount
=
(
i
.
bidCount
&&
i
.
price
)
?
new
BigNumber
(
+
i
.
bidCount
).
multipliedBy
(
i
.
price
).
toNumber
().
toFixed
(
2
)
:
''
})
console
.
log
(
'list'
,
newList
);
setData
(
newList
)
setIsPurchaseModalVisible
(
false
)
...
...
@@ -191,7 +193,6 @@ const FormList = (props: any) => {
// val_taxPoint(item)
})
setIsModalVisible
(
false
)
console
.
log
(
'list'
,
list
);
setData
(
list
)
}
...
...
@@ -508,7 +509,7 @@ const FormList = (props: any) => {
key
:
'price'
+
refresh
,
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<
Form
.
Item
name=
{
`price${record.id}`
}
name=
{
`price${record.
prpId}_${record.
id}`
}
initialValue=
{
text
!=
''
?
String
(
text
).
replace
(
/^
(
.*
\.
.{4}
)
.*$/
,
"$1"
)
:
''
}
rules=
{
[{
required
:
true
,
...
...
src/pages/transaction/purchaseRequisition/increaseRequisition/index.tsx
View file @
a487d78c
...
...
@@ -32,6 +32,7 @@ import ViewInventory from './components/viewInventory'
import
EditSalesman
from
'./components/editSalesman'
import
{
useLinkageUtils
}
from
'@/utils/formEffectUtils'
import
{
getPurchaseRequisitionSrmGetEnumsData
}
from
'@/services/PurchaseV2Api'
import
{
getMemberParameterManageGetArrivalArea
}
from
'@/services/MemberV2Api'
import
{
postContractManageGetFeignPayPlan
}
from
'@/services/ContractV2Api'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
RelationSaleOrderEdit
from
'../components/relationSaleOrderEdit'
...
...
@@ -622,11 +623,13 @@ const IncreaseRequisition: React.FC<{}> = () => {
getPurchaseRequisitionSrmGetEnumsData
().
then
((
res
:
any
)
=>
{
const
businessTypeMap
=
fnMap
(
res
.
data
?.
businessTypeMap
)
const
currencyMap
=
fnMap
(
res
.
data
?.
currencyMap
)
const
arrivalAreaMap
=
fnMap
(
res
.
data
?.
arrivalAreaMap
)
linkage
.
enum
(
'business'
,
businessTypeMap
)
// 默认小料
if
(
res
.
data
?.
businessTypeMap
?.[
'1'
]
===
'小料'
)
addSchemaAction
.
setFieldValue
(
'business'
,
'1'
)
linkage
.
enum
(
'currency'
,
currencyMap
)
})
getMemberParameterManageGetArrivalArea
().
then
((
res
:
any
)
=>
{
const
arrivalAreaMap
=
fnMap
(
res
.
data
)
linkage
.
enum
(
'arrivalArea'
,
arrivalAreaMap
);
})
})
...
...
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