Skip to content

J
jinfa-admin
Commit af4a1198 authored by Bill's avatar Bill
Browse files
Options

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

parents 4d508118 0b5fbb83
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 25 deletions
src/pages/marketingManage/marketing/waitAddedMarketing/components/rulesLayout/index.tsx
View file @ af4a1198
......@@ -292,7 +292,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'restrictPrice']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error('请输入每次砍价金额'));
}
......@@ -343,7 +343,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
>
{fields.map(({ key, name, fieldKey, ...restField }) => (
<Space key={key} style={{ display: 'flex', marginBottom: 8 }} align="center">
第
满
<Form.Item
{...restField}
style={{ margin: 0 }}
......@@ -351,8 +351,8 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
fieldKey={[fieldKey, `${int === ACTIVITY_TYPE_7 ? 'num' : 'key'}`]}
rules={[{
required: true, validator: (_rule, value) => {
const pattern1 = /^-?[1-9]\d*$/;
const pattern2 = /^-?[1-9]\d*(\.\d{1,2})?$/;
const pattern1 = /^[1-9]\d*$/;
const pattern2 = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/;
if (!value && int === ACTIVITY_TYPE_4) {
return Promise.reject(new Error('请输入数量'));
}
......@@ -382,24 +382,28 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
fieldKey={[fieldKey, `${int === ACTIVITY_TYPE_7 ? 'discount' : 'value'}`]}
rules={[{
required: true, validator: (_rule, value) => {
const pattern1 = /^-?[1-9]\d*(\.\d{1,1})?$/;
const pattern2 = /^-?[1-9]\d*(\.\d{1,2})?$/;
const pattern3 = /^(\d|[1-9]\d|99.999)(\.\d{1,1})?$/;
const pattern4 = /^(\d|[1-9]\d|99.999)(\.\d{1,2})?$/;
const pattern1 = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
const pattern2 = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
const pattern3 = /^(?!0+(?:\.0+)?$)\d?\d(?:\.\d{1,1}?)?$/;
const pattern4 = /^(?!0+(?:\.0+)?$)\d?\d(?:\.\d{1,1}?)?$/;
const valueKey = form.getFieldValue(`activityDefined`)['ladderList'][fieldKey]['key'];
if (!value) {
return Promise.reject(new Error('请输入'));
}
if (!pattern1.test(value) && (int === ACTIVITY_TYPE_4 || int === ACTIVITY_TYPE_7)) {
return Promise.reject(new Error(`必须大于0最多保留1位小数`));
if (!pattern1.test(value) && (int === ACTIVITY_TYPE_4 || int === ACTIVITY_TYPE_7) && type === 1) {
return Promise.reject(new Error('最多保留2位小数，大于0，不可为空'));
}
if (!pattern3.test(value) && (int === ACTIVITY_TYPE_4 || int === ACTIVITY_TYPE_7) && type === 2) {
return Promise.reject(new Error(`必须大于0且小于100最多保留1位小数`));
return Promise.reject(new Error('最多保留1位小数，大于0且小于100，不可为空'));
}
if (!pattern2.test(value) && int === ACTIVITY_TYPE_5) {
return Promise.reject(new Error(`必须大于0最多保留2位小数`));
if (!pattern2.test(value) && int === ACTIVITY_TYPE_5 && type === 1) {
return Promise.reject(new Error('最多保留2位小数，大于0，不可为空'));
}
if (int === ACTIVITY_TYPE_5 && type === 1 && Number(valueKey) <= Number(value)) {
return Promise.reject(new Error('最多保留2位小数，大于0且小于优惠门槛'))
}
if (!pattern4.test(value) && int === ACTIVITY_TYPE_5 && type === 2) {
return Promise.reject(new Error(`必须大于0且小于100最多保留2位小数`));
return Promise.reject(new Error('必须大于0且小于100最多保留2位小数'));
}
return Promise.resolve();
}
......@@ -432,7 +436,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'num']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error('请输入件数'));
}
......@@ -451,7 +455,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'price']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*(\.\d{1,2})?$/;
const pattern = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/;
if (!value) {
return Promise.reject(new Error('请输入金额'));
}
......@@ -530,7 +534,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
initialValue={1}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error('请输入限制次数'));
}
......@@ -647,7 +651,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
initialValue={1}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error('请输入参团限制次数'));
}
......@@ -795,7 +799,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'orderPrice']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*(\.\d{1,2})?$/;
const pattern = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/;
if (!value) {
return Promise.reject(new Error('请输入订单金额'));
}
......@@ -818,7 +822,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'integral']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error('请输入消耗积分'));
}
......@@ -876,7 +880,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
initialValue={1}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error('请输入抽奖次数'));
}
......
src/pages/systemManage/ruleSettingManage/procurementRules/components/RuleSetting.tsx
View file @ af4a1198
......@@ -18,7 +18,7 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect'
import SelectProcesss from './selectProcesss'
import ModalTable from '@/components/ModalTable'
import { getMemberManageLowerConsumerMemberPage, getMemberManagePageitems } from '@/services/MemberV2Api'
import { getOrderPlatformPurchaseProcessMemberPage } from '@/services/OrderNewV2Api'
import { getOrderPlatformPurchaseProcessGet, getOrderPlatformPurchaseProcessMemberPage } from '@/services/OrderNewV2Api'
export interface RuleSettingProps {
addSchemaAction: ISchemaFormActions,
......@@ -260,7 +260,6 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
useEffect(() => {
async function getInitValue() {
// @ts-ignore
const { data } = await getOrderPlatformPurchaseProcessGet({processId: id});
if(!data.allMembers) {
const res = await getBindingMembers({id: id.toString(), current: '1', pageSize: '10'})
......
src/pages/systemManage/ruleSettingManage/procurementRules/components/selectProcesss/index.tsx
View file @ af4a1198
......@@ -46,7 +46,8 @@ enum ProcessTagType {
'订单交易流程',
'售后换货流程',
'售后退货流程',
'售后维修流程'
'售后维修流程',
'请购单下单流程'
}
......
src/pages/systemManage/sensitiveWords/index.tsx
View file @ af4a1198
......@@ -77,7 +77,7 @@ const SensitiveWords: React.FC<{}> = () => {
<Space direction="horizontal" size={16}>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push(`/system/sensitiveWords/add`)}>新建</Button>
<Button onClick={() => confirmCancel(selectedRowKeys, true)}>批量删除</Button>
<Button>导出</Button>
{/* <Button>导出</Button> */}
</Space>
</Col>
</Row>
......
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