Skip to content

J
jinfa-platform
Commit 94ea8499 authored by Lfy-12's avatar Lfy-12
Browse files
Options

Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318

parents 9e5d04cd 1a9f8cbd
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 94 deletions
src/locales/en-US/member.ts
View file @ 94ea8499
...@@ -967,4 +967,5 @@ export default { ...@@ -967,4 +967,5 @@ export default {
'member.xinjian':'New', 'member.xinjian':'New',
'member.huiyuanziliao':'Member Information', 'member.huiyuanziliao':'Member Information',
'member.qingxuanze':'Please choose', '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 { ...@@ -960,4 +960,6 @@ export default {
'member.xinjian': '새로 만들다', 'member.xinjian': '새로 만들다',
'member.huiyuanziliao': '회원 자료', 'member.huiyuanziliao': '회원 자료',
'member.qingxuanze': '선택하십시오.', 'member.qingxuanze': '선택하십시오.',
'member.evaluate.validate.number': '정수'
} }
src/locales/zh-CN/member.ts
View file @ 94ea8499
...@@ -964,4 +964,5 @@ export default { ...@@ -964,4 +964,5 @@ export default {
'member.xinjian': '新建', 'member.xinjian': '新建',
'member.huiyuanziliao': '会员资料', 'member.huiyuanziliao': '会员资料',
'member.qingxuanze': '请选择', '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) => { ...@@ -178,7 +178,7 @@ const ContactLayout: React.FC<ContactProps> = (props) => {
rules={[ rules={[
{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingxuanzesuoshuzuzhiji', defaultMessage: '请选择所属组织机构' }) } { 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>
<Form.Item hidden <Form.Item hidden
label='所属组织机构' label='所属组织机构'
......
src/pages/balance/accountsPayable/settlementList/index.tsx
View file @ 94ea8499
...@@ -263,8 +263,8 @@ const SettlementList = () => { ...@@ -263,8 +263,8 @@ const SettlementList = () => {
const { payStartTime, payEndTime, prePayStartTime, prePayEndTime, ...rest } = values; const { payStartTime, payEndTime, prePayStartTime, prePayEndTime, ...rest } = values;
const startTime = values.startTime?.format(format); const startTime = values.startTime?.format(format);
const endTime = values.endTime ? values.endTime.endOf("day").format('YYYY-MM-DD HH:mm:ss') : ""; 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 withPayStartTime = payStartTime ? { payStartTime: payStartTime.unix() + "000", payEndTime: payEndTime.unix() + "999" } : {};
const withPrePayEndTime = prePayStartTime ? { prePayStartTime: prePayStartTime.valueOf(), prePayEndTime: prePayEndTime.valueOf() } : {}; const withPrePayEndTime = prePayStartTime ? { prePayStartTime: prePayStartTime.unix() + "000", prePayEndTime: prePayEndTime.unix() + "999" } : {};
ref.current.reload({ ...rest, startTime, endTime, ...withPayStartTime, ...withPrePayEndTime }); ref.current.reload({ ...rest, startTime, endTime, ...withPayStartTime, ...withPrePayEndTime });
} }
......
src/pages/balance/accountsReceivable/settlementList/index.tsx
View file @ 94ea8499
...@@ -117,8 +117,8 @@ const SettlementList = () => { ...@@ -117,8 +117,8 @@ const SettlementList = () => {
const { payStartTime, payEndTime, prePayStartTime, prePayEndTime, ...rest } = values; const { payStartTime, payEndTime, prePayStartTime, prePayEndTime, ...rest } = values;
const startTime = values.startTime?.format(format); const startTime = values.startTime?.format(format);
const endTime = values.endTime ? values.endTime.endOf("day").format('YYYY-MM-DD HH:mm:ss') : ""; 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 withPayStartTime = payStartTime ? { payStartTime: payStartTime.unix() + "000", payEndTime: payEndTime.unix() + "999" } : {};
const withPrePayEndTime = prePayStartTime ? { prePayStartTime: prePayStartTime.valueOf(), prePayEndTime: prePayEndTime.valueOf() } : {}; const withPrePayEndTime = prePayStartTime ? { prePayStartTime: prePayStartTime.unix() + "000", prePayEndTime: prePayEndTime.unix() + "999" } : {};
ref.current.reload({ ...rest, startTime, endTime, ...withPayStartTime, ...withPrePayEndTime }); 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 = { ...@@ -228,7 +228,7 @@ export const evaluateAddSchema: ISchema = {
type: 'string', type: 'string',
'x-component': 'FormilyCheckbox', 'x-component': 'FormilyCheckbox',
"x-props": { "x-props": {
width: 128 width: 110
}, },
'x-linkages': [ 'x-linkages': [
{ {
...@@ -242,12 +242,16 @@ export const evaluateAddSchema: ISchema = { ...@@ -242,12 +242,16 @@ export const evaluateAddSchema: ISchema = {
{ {
type: 'value:schema', type: 'value:schema',
// 考评人打分没勾选， 这几项都为必填 // 考评人打分没勾选， 这几项都为必填
target: '..[].*(grade,scoreWeight,templates,reports)', target: '..[].*(grade,scoreWeight)',
condition: `{{ !$value }}`, condition: `{{ !$value }}`,
schema: { schema: {
"x-rules": [ "x-rules": [
{ {
required: true, required: true,
},
{
pattern: /\d+/,
message: intl.formatMessage({ id: 'member.evaluate.validate.number', defaultMessage: '请填写正整数' }),
} }
] ]
}, },
...@@ -255,6 +259,30 @@ export const evaluateAddSchema: ISchema = { ...@@ -255,6 +259,30 @@ export const evaluateAddSchema: ISchema = {
"x-rules": [ "x-rules": [
{ {
required: false, 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: {
"x-rules": [
{
required: false,
} }
] ]
} }
...@@ -265,7 +293,10 @@ export const evaluateAddSchema: ISchema = { ...@@ -265,7 +293,10 @@ export const evaluateAddSchema: ISchema = {
title: `${intl.formatMessage({ id: 'member.memberEvaluate.schema.add.evaluateWieght'})}`, title: `${intl.formatMessage({ id: 'member.memberEvaluate.schema.add.evaluateWieght'})}`,
type: 'string', type: 'string',
"x-props": { "x-props": {
width: 95, width: 125,
},
"x-component-props": {
addonAfter: '%'
}, },
}, },
grade: { grade: {
......
src/pages/transaction/marketingAbility/components/listModalLayout/index.tsx
View file @ 94ea8499
...@@ -301,7 +301,7 @@ const ListModalLayout: React.FC<ListModalLayoutProps> = (props: any) => { ...@@ -301,7 +301,7 @@ const ListModalLayout: React.FC<ListModalLayoutProps> = (props: any) => {
isGift={isGift} isGift={isGift}
moda={remind.name === 'swapValue' ? 'radio' : 'checkbox'} moda={remind.name === 'swapValue' ? 'radio' : 'checkbox'}
visible={tableModalVisible} visible={tableModalVisible}
// idNotInList={idNotInList} idNotInList={idNotInList}
shopIdList={shopIdList} shopIdList={shopIdList}
toggle={toggle} toggle={toggle}
onConfirm={handleSubmit} 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) => { ...@@ -65,48 +65,48 @@ const DemandLayout: React.FC<DemandLayoutIProps> = (props: any) => {
key: 'levelTag', key: 'levelTag',
dataIndex: 'levelTag', dataIndex: 'levelTag',
}, },
{ // {
title: intl.formatMessage({ id: 'detail.purchase.isSubMember' }), // title: intl.formatMessage({ id: 'detail.purchase.isSubMember' }),
key: 'membershipOrNot', // key: 'membershipOrNot',
dataIndex: 'membershipOrNot', // dataIndex: 'membershipOrNot',
render: (text: any) => ( // render: (text: any) => (
<> // <>
{Number(text) === 1 && <Typography.Text type='success'>{intl.formatMessage({ id: 'detail.purchase.okText' })}</Typography.Text>} // {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>} // {Number(text) === 0 && <Typography.Text type='warning'>{intl.formatMessage({ id: 'detail.purchase.cancelText' })}</Typography.Text>}
</> // </>
) // )
}, // },
{ // {
title: ( // title: (
<> // <>
<span>{intl.formatMessage({ id: 'detail.purchase.demendSend' })}</span> // <span>{intl.formatMessage({ id: 'detail.purchase.demendSend' })}</span>
<Tooltip placement="top" title={intl.formatMessage({ id: 'detail.purchase.tips5' })}> // <Tooltip placement="top" title={intl.formatMessage({ id: 'detail.purchase.tips5' })}>
<QuestionCircleOutlined // <QuestionCircleOutlined
style={{ // style={{
marginLeft: '5px', // marginLeft: '5px',
fontSize: '14px', // fontSize: '14px',
color: '#909399' // color: '#909399'
}} // }}
/> // />
</Tooltip> // </Tooltip>
</> // </>
), // ),
key: 'state', // key: 'state',
dataIndex: 'state', // dataIndex: 'state',
render: (text: any) => ( // render: (text: any) => (
<Switch checked={text} disabled={true} /> // <Switch checked={text} disabled={true} />
) // )
}, // },
{ // {
title: intl.formatMessage({ id: 'table.purchase.operate' }), // title: intl.formatMessage({ id: 'table.purchase.operate' }),
key: 'operate', // key: 'operate',
dataIndex: 'operate', // dataIndex: 'operate',
render: (_text: any, _record: any) => ( // render: (_text: any, _record: any) => (
<Typography.Link href={`${ENTERPRISE_CENTER_URL}/shop/${_record.memberId}_${_record.roleId}`} target="_blank"> // <Typography.Link href={`${ENTERPRISE_CENTER_URL}/shop/${_record.memberId}_${_record.roleId}`} target="_blank">
{intl.formatMessage({ id: 'detail.purchase.entryMall' })} // {intl.formatMessage({ id: 'detail.purchase.entryMall' })}
</Typography.Link> // </Typography.Link>
) // )
}, // },
] ]
return ( return (
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/demand.tsx
View file @ 94ea8499
...@@ -90,49 +90,49 @@ const Demand: React.FC<Iprops> = (props: any) => { ...@@ -90,49 +90,49 @@ const Demand: React.FC<Iprops> = (props: any) => {
key: 'levelTag', key: 'levelTag',
dataIndex: 'levelTag', dataIndex: 'levelTag',
}, },
{ // {
title: intl.formatMessage({ id: 'detail.purchase.isSubMember' }), // title: intl.formatMessage({ id: 'detail.purchase.isSubMember' }),
key: 'membershipOrNot', // key: 'membershipOrNot',
dataIndex: 'membershipOrNot', // dataIndex: 'membershipOrNot',
render: (_text: any, _record: any) => <> // render: (_text: any, _record: any) => <>
{ (value === 3 || (value === 2 && _record.isSubMember === 1)) && <Typography.Text type='success'>是</Typography.Text>} // { (value === 3 || (value === 2 && _record.isSubMember === 1)) && <Typography.Text type='success'>是</Typography.Text>}
</> // </>
}, // },
{ // {
title: ( // title: (
<> // <>
<span>{intl.formatMessage({ id: 'detail.purchase.demendSend' })}</span> // <span>{intl.formatMessage({ id: 'detail.purchase.demendSend' })}</span>
<Tooltip placement="top" title={intl.formatMessage({ id: 'detail.purchase.tips5' })}> // <Tooltip placement="top" title={intl.formatMessage({ id: 'detail.purchase.tips5' })}>
<QuestionCircleOutlined // <QuestionCircleOutlined
style={{ // style={{
marginLeft: '5px', // marginLeft: '5px',
fontSize: '14px', // fontSize: '14px',
color: '#909399' // color: '#909399'
}} // }}
/> // />
</Tooltip> // </Tooltip>
</> // </>
), // ),
key: 'state', // key: 'state',
dataIndex: 'state', // dataIndex: 'state',
render: (_text: any, _record: any, index: number) => ( // render: (_text: any, _record: any, index: number) => (
<Form.Item // <Form.Item
style={{ marginBottom: 0 }} // style={{ marginBottom: 0 }}
> // >
<Switch checked={_text} onChange={(e: any) => handleGetSwitch(e, index)} /> // <Switch checked={_text} onChange={(e: any) => handleGetSwitch(e, index)} />
</Form.Item> // </Form.Item>
) // )
}, // },
{ // {
title: intl.formatMessage({ id: 'detail.purchase.option' }), // title: intl.formatMessage({ id: 'detail.purchase.option' }),
key: 'operate', // key: 'operate',
dataIndex: 'operate', // dataIndex: 'operate',
render: (_text: any, _record: any) => ( // render: (_text: any, _record: any) => (
<Link href={`${ENTERPRISE_CENTER_URL}/shop/${_record.memberId}_${_record.roleId}`} target="_blank"> // <Link href={`${ENTERPRISE_CENTER_URL}/shop/${_record.memberId}_${_record.roleId}`} target="_blank">
{intl.formatMessage({ id: 'detail.purchase.entryMall' })} // {intl.formatMessage({ id: 'detail.purchase.entryMall' })}
</Link> // </Link>
) // )
}, // },
] ]
/** 切换需求模式 */ /** 切换需求模式 */
const changeRadio = (e: any) => { const changeRadio = (e: any) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment