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
6c478b5f
Commit
6c478b5f
authored
Sep 23, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixbug
parent
bcea6348
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
130 additions
and
20 deletions
+130
-20
index.tsx
src/pages/member/memberImport/index.tsx
+16
-2
index.tsx
src/pages/member/memberMaintain/index.tsx
+16
-2
index.tsx
src/pages/member/memberPr1/index.tsx
+17
-2
index.tsx
src/pages/member/memberPr2/index.tsx
+17
-2
index.tsx
src/pages/member/memberPrConfirm/index.tsx
+17
-2
index.tsx
src/pages/member/memberPrSubmit/index.tsx
+17
-2
index.tsx
...s/transaction/stockSellStorage/billsType/schema/index.tsx
+13
-2
index.tsx
...s/transaction/stockSellStorage/warehouse/schema/index.tsx
+17
-6
No files found.
src/pages/member/memberImport/index.tsx
View file @
6c478b5f
...
...
@@ -16,6 +16,7 @@ import {
DownOutlined
,
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
moment
from
'moment'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
EyePreview
from
'@/components/EyePreview'
;
...
...
@@ -41,8 +42,21 @@ import { MEMBER_OUTER_STATUS_TYPE, MEMBER_STATUS_TAG_MAP } from '../constant';
const
formActions
=
createFormActions
();
const
fetchListData
=
async
(
params
:
any
)
=>
{
let
res
=
await
PublicApi
.
getMemberAbilitySubPage
(
params
);
return
res
.
data
;
const
{
startDate
=
null
,
endDate
=
null
}
=
params
;
const
payload
=
{
...
params
};
if
(
startDate
)
{
payload
.
startDate
=
moment
(
+
startDate
).
format
(
'YYYY-MM-DD'
);
}
if
(
endDate
)
{
payload
.
endDate
=
moment
(
+
endDate
).
format
(
'YYYY-MM-DD'
);
}
const
res
=
await
PublicApi
.
getMemberAbilitySubPage
(
payload
);
if
(
res
.
code
===
1000
)
{
return
res
.
data
;
}
return
[];
};
const
MemberMaintain
:
React
.
FC
<
[]
>
=
()
=>
{
...
...
src/pages/member/memberMaintain/index.tsx
View file @
6c478b5f
...
...
@@ -12,6 +12,7 @@ import {
DownOutlined
,
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
moment
from
'moment'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
...
...
@@ -38,8 +39,21 @@ import { coverColFiltersItem } from '../utils';
const
formActions
=
createFormActions
();
const
fetchData
=
async
(
params
:
any
)
=>
{
let
res
=
await
PublicApi
.
getMemberAbilityMaintenancePage
(
params
);
return
res
.
data
;
const
{
startDate
=
null
,
endDate
=
null
}
=
params
;
const
payload
=
{
...
params
};
if
(
startDate
)
{
payload
.
startDate
=
moment
(
+
startDate
).
format
(
'YYYY-MM-DD'
);
}
if
(
endDate
)
{
payload
.
endDate
=
moment
(
+
endDate
).
format
(
'YYYY-MM-DD'
);
}
const
res
=
await
PublicApi
.
getMemberAbilityMaintenancePage
(
payload
);
if
(
res
.
code
===
1000
)
{
return
res
.
data
;
}
return
[];
};
const
MemberMaintain
:
React
.
FC
<
[]
>
=
()
=>
{
...
...
src/pages/member/memberPr1/index.tsx
View file @
6c478b5f
...
...
@@ -3,6 +3,7 @@ import { history } from 'umi';
import
{
Card
,
Space
,
Button
,
Badge
,
Modal
,
message
}
from
'antd'
;
import
{
ClockCircleOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
moment
from
'moment'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
EyePreview
from
'@/components/EyePreview'
;
...
...
@@ -126,8 +127,22 @@ const MemberPr1: React.FC<{}> = props => {
};
const
fetchListData
=
async
(
params
:
any
)
=>
{
let
res
=
await
PublicApi
.
getMemberAbilityValidateStep1Page
(
params
);
return
res
.
data
;
const
{
startDate
=
null
,
endDate
=
null
}
=
params
;
const
payload
=
{
...
params
};
if
(
startDate
)
{
payload
.
startDate
=
moment
(
+
startDate
).
format
(
'YYYY-MM-DD'
);
}
if
(
endDate
)
{
payload
.
endDate
=
moment
(
+
endDate
).
format
(
'YYYY-MM-DD'
);
}
const
res
=
await
PublicApi
.
getMemberAbilityValidateStep1Page
(
payload
);
if
(
res
.
code
===
1000
)
{
return
res
.
data
;
}
return
[];
};
const
handleBatch
=
()
=>
{
...
...
src/pages/member/memberPr2/index.tsx
View file @
6c478b5f
...
...
@@ -3,6 +3,7 @@ import { history } from 'umi';
import
{
Card
,
Space
,
Button
,
Badge
,
Modal
,
message
}
from
'antd'
;
import
{
ClockCircleOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
moment
from
'moment'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
EyePreview
from
'@/components/EyePreview'
;
...
...
@@ -126,8 +127,22 @@ const MemberPr2: React.FC<{}> = props => {
};
const
fetchListData
=
async
(
params
:
any
)
=>
{
let
res
=
await
PublicApi
.
getMemberAbilityValidateStep2Page
(
params
);
return
res
.
data
;
const
{
startDate
=
null
,
endDate
=
null
}
=
params
;
const
payload
=
{
...
params
};
if
(
startDate
)
{
payload
.
startDate
=
moment
(
+
startDate
).
format
(
'YYYY-MM-DD'
);
}
if
(
endDate
)
{
payload
.
endDate
=
moment
(
+
endDate
).
format
(
'YYYY-MM-DD'
);
}
const
res
=
await
PublicApi
.
getMemberAbilityValidateStep2Page
(
payload
);
if
(
res
.
code
===
1000
)
{
return
res
.
data
;
}
return
[];
};
const
handleBatch
=
()
=>
{
...
...
src/pages/member/memberPrConfirm/index.tsx
View file @
6c478b5f
...
...
@@ -3,6 +3,7 @@ import { history } from 'umi';
import
{
Card
,
Space
,
Button
,
Badge
,
Modal
,
message
}
from
'antd'
;
import
{
ClockCircleOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
moment
from
'moment'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
EyePreview
from
'@/components/EyePreview'
;
...
...
@@ -129,8 +130,22 @@ const MemberPrConfirm: React.FC<{}> = props => {
};
const
fetchListData
=
async
(
params
:
any
)
=>
{
let
res
=
await
PublicApi
.
getMemberAbilityValidateConfirmPage
(
params
);
return
res
.
data
;
const
{
startDate
=
null
,
endDate
=
null
}
=
params
;
const
payload
=
{
...
params
};
if
(
startDate
)
{
payload
.
startDate
=
moment
(
+
startDate
).
format
(
'YYYY-MM-DD'
);
}
if
(
endDate
)
{
payload
.
endDate
=
moment
(
+
endDate
).
format
(
'YYYY-MM-DD'
);
}
const
res
=
await
PublicApi
.
getMemberAbilityValidateConfirmPage
(
payload
);
if
(
res
.
code
===
1000
)
{
return
res
.
data
;
}
return
[];
};
const
handleBatch
=
()
=>
{
...
...
src/pages/member/memberPrSubmit/index.tsx
View file @
6c478b5f
...
...
@@ -3,6 +3,7 @@ import { history } from 'umi';
import
{
Card
,
Space
,
Button
,
Badge
,
Modal
,
message
}
from
'antd'
;
import
{
ClockCircleOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
moment
from
'moment'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
EyePreview
from
'@/components/EyePreview'
;
...
...
@@ -126,8 +127,22 @@ const MemberPrSubmit: React.FC<{}> = props => {
};
const
fetchListData
=
async
(
params
:
any
)
=>
{
let
res
=
await
PublicApi
.
getMemberAbilityValidateCommitPage
(
params
);
return
res
.
data
;
const
{
startDate
=
null
,
endDate
=
null
}
=
params
;
const
payload
=
{
...
params
};
if
(
startDate
)
{
payload
.
startDate
=
moment
(
+
startDate
).
format
(
'YYYY-MM-DD'
);
}
if
(
endDate
)
{
payload
.
endDate
=
moment
(
+
endDate
).
format
(
'YYYY-MM-DD'
);
}
const
res
=
await
PublicApi
.
getMemberAbilityValidateCommitPage
(
payload
);
if
(
res
.
code
===
1000
)
{
return
res
.
data
;
}
return
[];
};
const
handleBatch
=
()
=>
{
...
...
src/pages/transaction/stockSellStorage/billsType/schema/index.tsx
View file @
6c478b5f
...
...
@@ -24,9 +24,20 @@ export const billsTypeDetailSchema: ISchema = {
title
:
'单据类型编号'
,
'x-component-props'
:
{
placeholder
:
'最长10个字符'
,
maxLength
:
5
,
maxLength
:
10
,
},
required
:
true
,
'x-rules'
:
[
{
required
:
true
,
message
:
'请输入单据类型编号'
,
},
{
validator
:
value
=>
{
const
CNReg
=
/
[\u
4E00-
\u
9FA5
]
/g
;
return
CNReg
.
test
(
value
)
?
'请输入非中文字符,可以是字母 + 数字 + 字符的组合'
:
''
;
},
},
],
},
name
:
{
type
:
'string'
,
...
...
src/pages/transaction/stockSellStorage/warehouse/schema/index.tsx
View file @
6c478b5f
...
...
@@ -110,7 +110,16 @@ export const warehouseDetailSchema: ISchema = {
'x-component-props'
:
{
label
:
'仓库名称'
,
wrapperCol
:
24
,
required
:
true
,
'x-rules'
:
[
{
required
:
true
,
message
:
'请输入仓库名称'
,
},
{
limitByte
:
true
,
// 自定义校验规则
maxByte
:
20
,
}
],
},
properties
:
{
MEGA_LAYOUT1_1
:
{
...
...
@@ -185,7 +194,13 @@ export const warehouseDetailSchema: ISchema = {
principal
:
{
type
:
'string'
,
title
:
'仓库负责人'
,
'x-component-props'
:
{},
'x-component-props'
:
{},
'x-rules'
:
[
{
limitByte
:
true
,
// 自定义校验规则
maxByte
:
16
,
}
],
},
MEGA_LAYOUT2
:
{
type
:
'object'
,
...
...
@@ -221,10 +236,6 @@ export const warehouseDetailSchema: ISchema = {
},
'x-rules'
:
[
{
required
:
true
,
message
:
'请输入你的手机号码'
,
},
{
pattern
:
PATTERN_MAPS
.
phone
,
message
:
'请输入正确格式的手机号'
,
},
...
...
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