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
d347fd66
Commit
d347fd66
authored
Jul 21, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 采购下单添加地址手机区号默认选中,价格管理选择商品列表添加shopId字段,处理仓位批量修改库存负数校验异常,招投标线下评标提交评标报告可手动输入
parent
e7b6f472
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
141 additions
and
23 deletions
+141
-23
ProductModal.tsx
...ages/priceManage/priceStrategy/component/ProductModal.tsx
+1
-0
index.tsx
...ds/readySubmitReport/components/remarkBidReport/index.tsx
+129
-18
index.tsx
...ds/readySubmitReport/components/remarkTableCell/index.tsx
+1
-1
index.tsx
src/pages/repositories/index.tsx
+2
-2
index.tsx
...chaseOrder/orderCollect/components/addressModal/index.tsx
+7
-1
index.tsx
...transaction/purchaseOrder/orderCollect/constant/index.tsx
+1
-1
No files found.
src/pages/priceManage/priceStrategy/component/ProductModal.tsx
View file @
d347fd66
...
...
@@ -51,6 +51,7 @@ const ProductModal:React.FC<ProductModalProps> = (props) => {
...
params
,
type
:
shopInfo
[
0
][
"type"
],
environment
:
shopInfo
[
0
].
environment
,
shopId
,
// priceTypeList: [1, 2],
})
return
res
.
data
...
...
src/pages/procurement/callForBids/readySubmitReport/components/remarkBidReport/index.tsx
View file @
d347fd66
This diff is collapsed.
Click to expand it.
src/pages/procurement/callForBids/readySubmitReport/components/remarkTableCell/index.tsx
View file @
d347fd66
...
...
@@ -74,7 +74,7 @@ export const EditableCell: React.FC<EditableCellProps> = ({
onPressEnter=
{
save
}
onBlur=
{
save
}
type=
"number"
disabled=
{
!
record
[
'editable'
]
}
//
disabled={!record['editable']}
/>
</
Form
.
Item
>
}
...
...
src/pages/repositories/index.tsx
View file @
d347fd66
...
...
@@ -171,8 +171,8 @@ const Repositories: React.FC<{}> = () => {
message
:
'请填写仓位库存'
,
},
{
pattern
:
PATTERN_MAPS
.
weight
,
message
:
'请填写
正数
,最多保留3位小数'
,
pattern
:
/^
[
+-
]?\d
*
(\.\d{0,3})?
$/
,
message
:
'请填写
数值
,最多保留3位小数'
,
},
],
},
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/addressModal/index.tsx
View file @
d347fd66
...
...
@@ -85,7 +85,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
modalProps=
{
{
destroyOnClose
:
true
}
}
effects=
{
(
$
,
{
setFieldState
})
=>
{
effects=
{
(
$
,
{
setFieldState
,
setFieldValue
})
=>
{
$
(
'onFormMount'
).
subscribe
(()
=>
{
PublicApi
.
getManageAreaAll
().
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -130,6 +130,12 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
);
useAsyncSelect
(
'areaCode'
,
fetchTelCode
)
$
(
'onFieldChange'
,
'areaCode'
).
subscribe
(
result
=>
{
if
(
result
.
props
.
enum
.
length
)
{
setFieldValue
(
'areaCode'
,
'86'
)
}
})
}
}
currentRef=
{
props
.
currentRef
}
actions=
{
addressSchemaAction
}
...
...
src/pages/transaction/purchaseOrder/orderCollect/constant/index.tsx
View file @
d347fd66
...
...
@@ -542,7 +542,7 @@ export const materialInfoColumns: any[] = [
dataIndex
:
'relevanceProductId'
,
align
:
'center'
,
key
:
'relevanceProductId'
,
render
:
(
t
,
r
)
=>
`
${
t
}
/
${
r
.
relevanceProductName
}
/
${
r
.
relevanceProductCategory
}
/
${
r
.
relevanceProductBrand
}
`
render
:
(
t
,
r
)
=>
`
${
t
}
/
${
r
.
relevanceProductName
||
''
}
/
${
r
.
relevanceProductCategory
||
''
}
/
${
r
.
relevanceProductBrand
||
''
}
`
},
{
title
:
'单价(元)'
,
...
...
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