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
ead2c704
Commit
ead2c704
authored
May 10, 2022
by
前端-甘科
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '220518-feat' into 'v2-220518'
规则引擎选择物料筛选条件及分页样式调整/新增规则引擎列表配置按钮判断 See merge request linkseeks-design/pro-platform!667
parents
9501ae3e
bd781fe4
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
75 additions
and
21 deletions
+75
-21
global.less
src/global/styles/global.less
+53
-0
index.less
src/global/styles/index.less
+2
-3
index.tsx
.../systemSetting/ruleEng/contractCoordinationRule/index.tsx
+1
-1
index.tsx
src/pages/systemSetting/ruleEng/contractManageRule/index.tsx
+1
-1
index.tsx
src/pages/systemSetting/ruleEng/materialManageRule/index.tsx
+1
-1
index.tsx
...pages/systemSetting/ruleEng/purchaseProcessRule/index.tsx
+1
-1
index.tsx
...es/systemSetting/ruleEng/requestFundsManageRule/index.tsx
+1
-1
index.tsx
...ruleEng/ruleEngConfig/components/MaterialDrawer/index.tsx
+10
-8
index.tsx
.../ruleEngConfig/components/MaterialDrawer/schema/index.tsx
+1
-1
index.tsx
...ruleEng/ruleEngConfig/components/SelectMaterial/index.tsx
+1
-1
index.tsx
...ing/ruleEng/ruleEngConfig/components/WrapSelect/index.tsx
+3
-3
No files found.
src/global/styles/global.less
View file @
ead2c704
...
...
@@ -520,3 +520,56 @@ a {
width: 100%;
}
}
// 定制化迷你分页样式
.use-ant-pagination-mini {
.mini {
color: #909399;
.ant-pagination-total-text {
font-size: 12px;
color: #909399;
}
.ant-pagination-prev,
.ant-pagination-next {
border-radius: 4px;
background-color: #F5F6F7;
margin-right: 6px !important;
.ant-pagination-item-link {
color: rgba(0, 0, 0, 0.6)
}
}
.ant-pagination-item {
font-size: 12px;
background-color: #F5F6F7 !important;
margin-right: 8px !important;
> a {
color: #5C626A !important;
}
}
.ant-pagination-item-active {
color: @primary-color !important;
background-color: #EBF9F6 !important;
> a {
color: @primary-color !important;
}
}
.ant-pagination-options {
margin-left: 0;
.ant-select {
.ant-select-selector {
background-color: #F5F6F7 !important;
.ant-select-selection-item {
font-size: 12px;
color: #909399;
}
}
}
.ant-pagination-options-quick-jumper {
> input {
background-color: #F5F6F7 !important;
}
}
}
}
}
src/global/styles/index.less
View file @
ead2c704
@primary-color: #00
B37A
;
@primary-color: #00
A98F
;
// 公共padding变量
@padding-lg: 24px;
...
...
@@ -11,4 +11,4 @@
@margin-md: 16px;
@margin-sm: 12px;
@margin-xs: 8px;
@margin-xss: 4px;
\ No newline at end of file
@margin-xss: 4px;
src/pages/systemSetting/ruleEng/contractCoordinationRule/index.tsx
View file @
ead2c704
...
...
@@ -14,7 +14,7 @@ const ContractCoordinationRule: React.FC = () => {
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'配置'
:
'contractCoordinationRule.config'
}
const
buttonGroup
=
{
'配置'
:
true
}
const
buttonGroup
=
{
'配置'
:
record
.
processKind
===
1
}
// 内部流程才展示
const
operationHandler
=
{
'配置'
:
()
=>
{
history
.
push
(
`/memberCenter/systemSetting/ruleEng/ruleEngConfig?type=CONTRACT_COORDINATION&processId=
${
record
.
processId
}
`
)
}}
...
...
src/pages/systemSetting/ruleEng/contractManageRule/index.tsx
View file @
ead2c704
...
...
@@ -14,7 +14,7 @@ const ContractManageRule: React.FC = () => {
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'配置'
:
'contractManageRule.config'
}
const
buttonGroup
=
{
'配置'
:
true
}
const
buttonGroup
=
{
'配置'
:
record
.
processKind
===
1
}
// 内部流程才展示
const
operationHandler
=
{
'配置'
:
()
=>
{
history
.
push
(
`/memberCenter/systemSetting/ruleEng/ruleEngConfig?type=CONTRACT_MANAGE&processId=
${
record
.
processId
}
`
)
}}
...
...
src/pages/systemSetting/ruleEng/materialManageRule/index.tsx
View file @
ead2c704
...
...
@@ -14,7 +14,7 @@ const BuyingRequisitionRule: React.FC = () => {
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'配置'
:
'materialManageRule.config'
}
const
buttonGroup
=
{
'配置'
:
true
}
const
buttonGroup
=
{
'配置'
:
record
.
processKind
===
1
}
// 内部流程才展示
const
operationHandler
=
{
'配置'
:
()
=>
{
history
.
push
(
`/memberCenter/systemSetting/ruleEng/ruleEngConfig?type=MATERIAL_MANAGE&processId=
${
record
.
processId
}
`
)
}}
...
...
src/pages/systemSetting/ruleEng/purchaseProcessRule/index.tsx
View file @
ead2c704
...
...
@@ -14,7 +14,7 @@ const PurchaseProcessRule: React.FC = () => {
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'配置'
:
'purchaseProcessRule.config'
}
const
buttonGroup
=
{
'配置'
:
true
}
const
buttonGroup
=
{
'配置'
:
record
.
processKind
===
1
}
// 内部流程才展示
const
operationHandler
=
{
'配置'
:
()
=>
{
history
.
push
(
`/memberCenter/systemSetting/ruleEng/ruleEngConfig?type=PURCHASE_PROCESS&processId=
${
record
.
processId
}
`
)
}}
...
...
src/pages/systemSetting/ruleEng/requestFundsManageRule/index.tsx
View file @
ead2c704
...
...
@@ -14,7 +14,7 @@ const RequestFundsManageRule: React.FC = () => {
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'配置'
:
'requestFundsManageRule.config'
}
const
buttonGroup
=
{
'配置'
:
true
}
const
buttonGroup
=
{
'配置'
:
record
.
processKind
===
1
}
// 内部流程才展示
const
operationHandler
=
{
'配置'
:
()
=>
{
history
.
push
(
`/memberCenter/systemSetting/ruleEng/ruleEngConfig?type=REQUEST_FUNDS_MANAGE&processId=
${
record
.
processId
}
`
)
}}
...
...
src/pages/systemSetting/ruleEng/ruleEngConfig/components/MaterialDrawer/index.tsx
View file @
ead2c704
...
...
@@ -32,6 +32,7 @@ const MaterialDrawer = (props: PropsType, ref) => {
const
[
selectedRowKeys
,
setSelectedRowKeys
]
=
useState
<
any
>
([])
const
[
selectedRows
,
setSelectedRows
]
=
useState
<
any
>
([])
const
[
isQueryAll
,
setIsQueryAll
]
=
useState
<
boolean
>
(
false
)
const
[
tabKey
,
setTabKey
]
=
useState
<
string
>
(
'1'
)
const
tableRef
=
useRef
<
any
>
({})
const
drawRef
=
useRef
<
HandleType
>
()
...
...
@@ -56,15 +57,16 @@ const MaterialDrawer = (props: PropsType, ref) => {
onOk
?.(
selectedRows
.
map
(
item
=>
({
id
:
item
.
id
,
value
:
item
.
value
}))
,
selectedRowKeys
)
},
[
selectedRows
,
selectedRowKeys
,
isQueryAll
])
const
handleShow
=
useCallback
((
params
:
Object
)
=>
{
},
[])
const
fetchData
=
(
params
:
any
)
=>
{
const
materialGroupId
=
params
?.
materialGroupId
?.
length
?
params
?.
materialGroupId
[
params
?.
materialGroupId
?.
length
-
1
]
:
''
const
customerCategoryId
=
params
?.
customerCategoryId
?.
length
?
params
?.
customerCategoryId
[
params
?.
customerCategoryId
?.
length
-
1
]
:
''
materialGroupId
&&
(
params
.
materialGroupId
=
materialGroupId
)
customerCategoryId
&&
(
params
.
customerCategoryId
=
customerCategoryId
)
return
new
Promise
((
resolve
)
=>
{
getProductGoodsGetDoesNotFreezeGoodsList
(
params
).
then
(({
code
,
data
})
=>
{
if
(
code
===
1000
)
{
resolve
({
total
:
data
.
total
,
total
Count
:
data
.
totalCount
,
data
:
data
.
data
?.
map
(
item
=>
({
...
item
,
value
:
getRealCodeValue
(
item
)
}))
})
}
...
...
@@ -125,6 +127,7 @@ const MaterialDrawer = (props: PropsType, ref) => {
const
selectKeys
=
data
?.
selectData
?.
map
(
item
=>
item
.
id
)
||
[]
setSelectedRowKeys
(
selectKeys
)
setIsQueryAll
(
data
?.
isQueryAll
||
false
)
setTabKey
(
data
?.
isSeeMore
?
'2'
:
'1'
)
}
},
setRows
(
rows
:
any
[])
{
...
...
@@ -156,7 +159,6 @@ const MaterialDrawer = (props: PropsType, ref) => {
width=
{
1000
}
destroyOnClose
onOk=
{
handleOk
}
onShow=
{
handleShow
}
onCancel=
{
(
fnClose
)
=>
{
if
(
isValuesChangeRef
.
current
)
{
Modal
.
confirm
({
...
...
@@ -179,8 +181,8 @@ const MaterialDrawer = (props: PropsType, ref) => {
所有物料
</
Checkbox
>
</
div
>
<
Tabs
defaultActiveKey=
'1'
onChange=
{
()
=>
{
}
}
>
<
Tabs
.
TabPane
tab=
'可选择'
key=
'1'
>
<
Tabs
activeKey=
{
tabKey
}
onChange=
{
(
key
:
string
)
=>
{
setTabKey
(
key
)
}
}
>
<
Tabs
.
TabPane
tab=
'可选择'
key=
'1'
className=
'use-ant-pagination-mini'
>
{
!
isQueryAll
&&
(
<
StandardTable
...
...
@@ -204,7 +206,7 @@ const MaterialDrawer = (props: PropsType, ref) => {
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'code'
,
FORM_FILTER_PATH
);
useAsyncCascader
(
'materialGroupId'
,
fetchTreeData
)
useAsyncCascader
(
'categoryId'
,
fetchCategoryData
)
useAsyncCascader
(
'c
ustomerC
ategoryId'
,
fetchCategoryData
)
useAsyncSelect
(
'brandId'
,
fetchBrand
,
[
"name"
,
"id"
])
}
}
schema=
{
schema
}
...
...
src/pages/systemSetting/ruleEng/ruleEngConfig/components/MaterialDrawer/schema/index.tsx
View file @
ead2c704
...
...
@@ -68,7 +68,7 @@ export const schema: ISchema = {
fieldNames
:
{
label
:
'title'
,
value
:
'id'
,
children
:
'children'
},
}
},
categoryId
:
{
c
ustomerC
ategoryId
:
{
type
:
'string'
,
'x-component'
:
'Cascader'
,
'x-component-props'
:
{
...
...
src/pages/systemSetting/ruleEng/ruleEngConfig/components/SelectMaterial/index.tsx
View file @
ead2c704
...
...
@@ -53,7 +53,7 @@ const SelectMaterial = (props: PropsType) => {
return
(
<>
<
WrapSelect
onIconClick=
{
(
)
=>
{
ref
?.
current
?.
show
(
true
,
{},
{
selectData
,
isQueryAll
})
}
}
onIconClick=
{
(
isSeeMore
)
=>
{
ref
?.
current
?.
show
(
true
,
{},
{
selectData
,
isQueryAll
,
isSeeMore
})
}
}
onItemDelete=
{
onItemDelete
}
data=
{
selectData
}
labelKey=
'value'
...
...
src/pages/systemSetting/ruleEng/ruleEngConfig/components/WrapSelect/index.tsx
View file @
ead2c704
...
...
@@ -4,7 +4,7 @@ import styles from './index.less'
import
{
LinkOutlined
,
CloseOutlined
}
from
'@ant-design/icons'
interface
PropsType
{
onIconClick
?:
()
=>
void
onIconClick
?:
(
isSeeMore
?:
boolean
)
=>
void
onItemClick
?:
(
a
:
any
)
=>
void
onItemDelete
?:
(
a
:
any
)
=>
void
data
?:
any
[]
...
...
@@ -40,8 +40,8 @@ const WrapSelect = (props: PropsType) => {
}
{
data
.
length
>
3
&&
(
<
div
className=
{
styles
[
'content-item'
]
}
onClick=
{
()
=>
onIconClick
?.()
}
>
更多
<
div
className=
{
styles
[
'content-item'
]
}
onClick=
{
()
=>
onIconClick
?.(
true
)
}
>
更多
(
{
data
.
length
-
3
}
)
</
div
>
)
}
...
...
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