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
94ea8499
Commit
94ea8499
authored
Mar 18, 2022
by
Lfy-12
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2-220318' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2-220318
parents
9e5d04cd
1a9f8cbd
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
129 additions
and
94 deletions
+129
-94
member.ts
src/locales/en-US/member.ts
+1
-0
member.ts
src/locales/ko-KR/member.ts
+2
-0
member.ts
src/locales/zh-CN/member.ts
+1
-0
contactLayout.tsx
...ages/authConfig/portalSystem/components/contactLayout.tsx
+1
-1
index.tsx
src/pages/balance/accountsPayable/settlementList/index.tsx
+2
-2
index.tsx
...pages/balance/accountsReceivable/settlementList/index.tsx
+2
-2
add.tsx
src/pages/member/memberEvaluate/schema/add.tsx
+34
-3
index.tsx
...ion/marketingAbility/components/listModalLayout/index.tsx
+1
-1
index.tsx
...ility/components/detail/components/demandLayout/index.tsx
+42
-42
demand.tsx
...eAbility/purchaseInquiry/addInquiry/components/demand.tsx
+43
-43
No files found.
src/locales/en-US/member.ts
View file @
94ea8499
...
...
@@ -967,4 +967,5 @@ export default {
'member.xinjian'
:
'New'
,
'member.huiyuanziliao'
:
'Member Information'
,
'member.qingxuanze'
:
'Please choose'
,
'member.evaluate.validate.number'
:
'Please fill in a positive integer'
}
src/locales/ko-KR/member.ts
View file @
94ea8499
...
...
@@ -960,4 +960,6 @@ export default {
'member.xinjian'
:
'새로 만들다'
,
'member.huiyuanziliao'
:
'회원 자료'
,
'member.qingxuanze'
:
'선택하십시오.'
,
'member.evaluate.validate.number'
:
'정수'
}
src/locales/zh-CN/member.ts
View file @
94ea8499
...
...
@@ -964,4 +964,5 @@ export default {
'member.xinjian'
:
'新建'
,
'member.huiyuanziliao'
:
'会员资料'
,
'member.qingxuanze'
:
'请选择'
,
'member.evaluate.validate.number'
:
'请填写正整数'
}
src/pages/authConfig/portalSystem/components/contactLayout.tsx
View file @
94ea8499
...
...
@@ -178,7 +178,7 @@ const ContactLayout: React.FC<ContactProps> = (props) => {
rules=
{
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'portalSystem.qingxuanzesuoshuzuzhiji'
,
defaultMessage
:
'请选择所属组织机构'
})
}
]
}
>
<
Input
.
Search
placeholder=
{
intl
.
formatMessage
({
id
:
'portalSystem.qingxuanzesuoshuzuzhiji'
,
defaultMessage
:
'请选择所属组织机构'
})
}
readOnly
enterButton=
{
<
Button
style=
{
{
backgroundColor
:
'#00a98f'
}
}
type=
'primary'
onClick=
{
()
=>
openOriginTree
()
}
icon=
{
<
LinkOutlined
style=
{
{
marginRight
:
4
}
}
/>
}
>
{
intl
.
formatMessage
({
id
:
'portalSystem.xuanze'
,
defaultMessage
:
'选择'
})
}
</
Button
>
}
/>
<
Input
.
Search
onSearch=
{
()
=>
openOriginTree
()
}
placeholder=
{
intl
.
formatMessage
({
id
:
'portalSystem.qingxuanzesuoshuzuzhiji'
,
defaultMessage
:
'请选择所属组织机构'
})
}
readOnly
enterButton=
{
<
Button
style=
{
{
backgroundColor
:
'#00a98f'
}
}
type=
'primary'
icon=
{
<
LinkOutlined
style=
{
{
marginRight
:
4
}
}
/>
}
>
{
intl
.
formatMessage
({
id
:
'portalSystem.xuanze'
,
defaultMessage
:
'选择'
})
}
</
Button
>
}
/>
</
Form
.
Item
>
<
Form
.
Item
hidden
label=
'所属组织机构'
...
...
src/pages/balance/accountsPayable/settlementList/index.tsx
View file @
94ea8499
...
...
@@ -263,8 +263,8 @@ const SettlementList = () => {
const
{
payStartTime
,
payEndTime
,
prePayStartTime
,
prePayEndTime
,
...
rest
}
=
values
;
const
startTime
=
values
.
startTime
?.
format
(
format
);
const
endTime
=
values
.
endTime
?
values
.
endTime
.
endOf
(
"day"
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
""
;
const
withPayStartTime
=
payStartTime
?
{
payStartTime
:
payStartTime
.
valueOf
(),
payEndTime
:
payEndTime
.
valueOf
()
}
:
{};
const
withPrePayEndTime
=
prePayStartTime
?
{
prePayStartTime
:
prePayStartTime
.
valueOf
(),
prePayEndTime
:
prePayEndTime
.
valueOf
()
}
:
{};
const
withPayStartTime
=
payStartTime
?
{
payStartTime
:
payStartTime
.
unix
()
+
"000"
,
payEndTime
:
payEndTime
.
unix
()
+
"999"
}
:
{};
const
withPrePayEndTime
=
prePayStartTime
?
{
prePayStartTime
:
prePayStartTime
.
unix
()
+
"000"
,
prePayEndTime
:
prePayEndTime
.
unix
()
+
"999"
}
:
{};
ref
.
current
.
reload
({
...
rest
,
startTime
,
endTime
,
...
withPayStartTime
,
...
withPrePayEndTime
});
}
...
...
src/pages/balance/accountsReceivable/settlementList/index.tsx
View file @
94ea8499
...
...
@@ -117,8 +117,8 @@ const SettlementList = () => {
const
{
payStartTime
,
payEndTime
,
prePayStartTime
,
prePayEndTime
,
...
rest
}
=
values
;
const
startTime
=
values
.
startTime
?.
format
(
format
);
const
endTime
=
values
.
endTime
?
values
.
endTime
.
endOf
(
"day"
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
""
;
const
withPayStartTime
=
payStartTime
?
{
payStartTime
:
payStartTime
.
valueOf
(),
payEndTime
:
payEndTime
.
valueOf
()
}
:
{};
const
withPrePayEndTime
=
prePayStartTime
?
{
prePayStartTime
:
prePayStartTime
.
valueOf
(),
prePayEndTime
:
prePayEndTime
.
valueOf
()
}
:
{};
const
withPayStartTime
=
payStartTime
?
{
payStartTime
:
payStartTime
.
unix
()
+
"000"
,
payEndTime
:
payEndTime
.
unix
()
+
"999"
}
:
{};
const
withPrePayEndTime
=
prePayStartTime
?
{
prePayStartTime
:
prePayStartTime
.
unix
()
+
"000"
,
prePayEndTime
:
prePayEndTime
.
unix
()
+
"999"
}
:
{};
ref
.
current
.
reload
({
...
rest
,
startTime
,
endTime
,
...
withPayStartTime
,
...
withPrePayEndTime
});
}
...
...
src/pages/member/memberEvaluate/schema/add.tsx
View file @
94ea8499
...
...
@@ -228,7 +228,7 @@ export const evaluateAddSchema: ISchema = {
type
:
'string'
,
'x-component'
:
'FormilyCheckbox'
,
"x-props"
:
{
width
:
1
28
width
:
1
10
},
'x-linkages'
:
[
{
...
...
@@ -242,13 +242,41 @@ export const evaluateAddSchema: ISchema = {
{
type
:
'value:schema'
,
// 考评人打分没勾选, 这几项都为必填
target
:
'..[].*(grade,scoreWeight
,templates,reports
)'
,
target
:
'..[].*(grade,scoreWeight)'
,
condition
:
`{{ !$value }}`
,
schema
:
{
"x-rules"
:
[
{
required
:
true
,
},
{
pattern
:
/
\d
+/
,
message
:
intl
.
formatMessage
({
id
:
'member.evaluate.validate.number'
,
defaultMessage
:
'请填写正整数'
}),
}
]
},
otherwise
:
{
"x-rules"
:
[
{
required
:
false
,
},
{
pattern
:
/
\d
+/
,
message
:
intl
.
formatMessage
({
id
:
'member.evaluate.validate.number'
,
defaultMessage
:
'请填写正整数'
}),
}
]
}
},
{
type
:
'value:schema'
,
// 考评人打分没勾选, 这几项都为必填
target
:
'..[].*(templates,reports)'
,
condition
:
`{{ !$value }}`
,
schema
:
{
"x-rules"
:
[
{
required
:
true
,
},
]
},
otherwise
:
{
...
...
@@ -265,7 +293,10 @@ export const evaluateAddSchema: ISchema = {
title
:
`
${
intl
.
formatMessage
({
id
:
'member.memberEvaluate.schema.add.evaluateWieght'
})}
`
,
type
:
'string'
,
"x-props"
:
{
width
:
95
,
width
:
125
,
},
"x-component-props"
:
{
addonAfter
:
'%'
},
},
grade
:
{
...
...
src/pages/transaction/marketingAbility/components/listModalLayout/index.tsx
View file @
94ea8499
...
...
@@ -301,7 +301,7 @@ const ListModalLayout: React.FC<ListModalLayoutProps> = (props: any) => {
isGift=
{
isGift
}
moda=
{
remind
.
name
===
'swapValue'
?
'radio'
:
'checkbox'
}
visible=
{
tableModalVisible
}
//
idNotInList={idNotInList}
idNotInList=
{
idNotInList
}
shopIdList=
{
shopIdList
}
toggle=
{
toggle
}
onConfirm=
{
handleSubmit
}
...
...
src/pages/transaction/purchaseAbility/components/detail/components/demandLayout/index.tsx
View file @
94ea8499
...
...
@@ -65,48 +65,48 @@ const DemandLayout: React.FC<DemandLayoutIProps> = (props: any) => {
key
:
'levelTag'
,
dataIndex
:
'levelTag'
,
},
{
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.isSubMember'
}),
key
:
'membershipOrNot'
,
dataIndex
:
'membershipOrNot'
,
render
:
(
text
:
any
)
=>
(
<>
{
Number
(
text
)
===
1
&&
<
Typography
.
Text
type=
'success'
>
{
intl
.
formatMessage
({
id
:
'detail.purchase.okText'
})
}
</
Typography
.
Text
>
}
{
Number
(
text
)
===
0
&&
<
Typography
.
Text
type=
'warning'
>
{
intl
.
formatMessage
({
id
:
'detail.purchase.cancelText'
})
}
</
Typography
.
Text
>
}
</>
)
},
{
title
:
(
<>
<
span
>
{
intl
.
formatMessage
({
id
:
'detail.purchase.demendSend'
})
}
</
span
>
<
Tooltip
placement=
"top"
title=
{
intl
.
formatMessage
({
id
:
'detail.purchase.tips5'
})
}
>
<
QuestionCircleOutlined
style=
{
{
marginLeft
:
'5px'
,
fontSize
:
'14px'
,
color
:
'#909399'
}
}
/>
</
Tooltip
>
</>
),
key
:
'state'
,
dataIndex
:
'state'
,
render
:
(
text
:
any
)
=>
(
<
Switch
checked=
{
text
}
disabled=
{
true
}
/>
)
},
{
title
:
intl
.
formatMessage
({
id
:
'table.purchase.operate'
}),
key
:
'operate'
,
dataIndex
:
'operate'
,
render
:
(
_text
:
any
,
_record
:
any
)
=>
(
<
Typography
.
Link
href=
{
`${ENTERPRISE_CENTER_URL}/shop/${_record.memberId}_${_record.roleId}`
}
target=
"_blank"
>
{
intl
.
formatMessage
({
id
:
'detail.purchase.entryMall'
})
}
</
Typography
.
Link
>
)
},
//
{
//
title: intl.formatMessage({ id: 'detail.purchase.isSubMember' }),
//
key: 'membershipOrNot',
//
dataIndex: 'membershipOrNot',
//
render: (text: any) => (
//
<>
//
{Number(text) === 1 && <Typography.Text type='success'>{intl.formatMessage({ id: 'detail.purchase.okText' })}</Typography.Text>}
//
{Number(text) === 0 && <Typography.Text type='warning'>{intl.formatMessage({ id: 'detail.purchase.cancelText' })}</Typography.Text>}
//
</>
//
)
//
},
//
{
//
title: (
//
<>
//
<span>{intl.formatMessage({ id: 'detail.purchase.demendSend' })}</span>
//
<Tooltip placement="top" title={intl.formatMessage({ id: 'detail.purchase.tips5' })}>
//
<QuestionCircleOutlined
//
style={{
//
marginLeft: '5px',
//
fontSize: '14px',
//
color: '#909399'
//
}}
//
/>
//
</Tooltip>
//
</>
//
),
//
key: 'state',
//
dataIndex: 'state',
//
render: (text: any) => (
//
<Switch checked={text} disabled={true} />
//
)
//
},
//
{
//
title: intl.formatMessage({ id: 'table.purchase.operate' }),
//
key: 'operate',
//
dataIndex: 'operate',
//
render: (_text: any, _record: any) => (
//
<Typography.Link href={`${ENTERPRISE_CENTER_URL}/shop/${_record.memberId}_${_record.roleId}`} target="_blank">
//
{intl.formatMessage({ id: 'detail.purchase.entryMall' })}
//
</Typography.Link>
//
)
//
},
]
return
(
...
...
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/demand.tsx
View file @
94ea8499
...
...
@@ -90,49 +90,49 @@ const Demand: React.FC<Iprops> = (props: any) => {
key
:
'levelTag'
,
dataIndex
:
'levelTag'
,
},
{
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.isSubMember'
}),
key
:
'membershipOrNot'
,
dataIndex
:
'membershipOrNot'
,
render
:
(
_text
:
any
,
_record
:
any
)
=>
<>
{
(
value
===
3
||
(
value
===
2
&&
_record
.
isSubMember
===
1
))
&&
<
Typography
.
Text
type=
'success'
>
是
</
Typography
.
Text
>
}
</>
},
{
title
:
(
<>
<
span
>
{
intl
.
formatMessage
({
id
:
'detail.purchase.demendSend'
})
}
</
span
>
<
Tooltip
placement=
"top"
title=
{
intl
.
formatMessage
({
id
:
'detail.purchase.tips5'
})
}
>
<
QuestionCircleOutlined
style=
{
{
marginLeft
:
'5px'
,
fontSize
:
'14px'
,
color
:
'#909399'
}
}
/>
</
Tooltip
>
</>
),
key
:
'state'
,
dataIndex
:
'state'
,
render
:
(
_text
:
any
,
_record
:
any
,
index
:
number
)
=>
(
<
Form
.
Item
style=
{
{
marginBottom
:
0
}
}
>
<
Switch
checked=
{
_text
}
onChange=
{
(
e
:
any
)
=>
handleGetSwitch
(
e
,
index
)
}
/>
</
Form
.
Item
>
)
},
{
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.option'
}),
key
:
'operate'
,
dataIndex
:
'operate'
,
render
:
(
_text
:
any
,
_record
:
any
)
=>
(
<
Link
href=
{
`${ENTERPRISE_CENTER_URL}/shop/${_record.memberId}_${_record.roleId}`
}
target=
"_blank"
>
{
intl
.
formatMessage
({
id
:
'detail.purchase.entryMall'
})
}
</
Link
>
)
},
//
{
//
title: intl.formatMessage({ id: 'detail.purchase.isSubMember' }),
//
key: 'membershipOrNot',
//
dataIndex: 'membershipOrNot',
//
render: (_text: any, _record: any) => <>
//
{ (value === 3 || (value === 2 && _record.isSubMember === 1)) && <Typography.Text type='success'>是</Typography.Text>}
//
</>
//
},
//
{
//
title: (
//
<>
//
<span>{intl.formatMessage({ id: 'detail.purchase.demendSend' })}</span>
//
<Tooltip placement="top" title={intl.formatMessage({ id: 'detail.purchase.tips5' })}>
//
<QuestionCircleOutlined
//
style={{
//
marginLeft: '5px',
//
fontSize: '14px',
//
color: '#909399'
//
}}
//
/>
//
</Tooltip>
//
</>
//
),
//
key: 'state',
//
dataIndex: 'state',
//
render: (_text: any, _record: any, index: number) => (
//
<Form.Item
//
style={{ marginBottom: 0 }}
//
>
//
<Switch checked={_text} onChange={(e: any) => handleGetSwitch(e, index)} />
//
</Form.Item>
//
)
//
},
//
{
//
title: intl.formatMessage({ id: 'detail.purchase.option' }),
//
key: 'operate',
//
dataIndex: 'operate',
//
render: (_text: any, _record: any) => (
//
<Link href={`${ENTERPRISE_CENTER_URL}/shop/${_record.memberId}_${_record.roleId}`} target="_blank">
//
{intl.formatMessage({ id: 'detail.purchase.entryMall' })}
//
</Link>
//
)
//
},
]
/** 切换需求模式 */
const
changeRadio
=
(
e
:
any
)
=>
{
...
...
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