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
黄庭坚
jinfa-platform
Commits
b24e8ce3
Commit
b24e8ce3
authored
Dec 04, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:新增采购订单查询内部工作流添加memberRoleId和orderModel字段,处理添加发票弹框提交无校验问题
parent
1109e1c7
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
23 deletions
+20
-23
applyWithdraw.tsx
...yandSettle/capitalAccounts/accountLists/applyWithdraw.tsx
+1
-1
index.tsx
...chaseOrder/orderCollect/components/invoiceModal/index.tsx
+0
-0
schema.ts
...chaseOrder/orderCollect/components/invoiceModal/schema.ts
+13
-21
index.tsx
...Order/orderCollect/components/productModalTable/index.tsx
+6
-1
No files found.
src/pages/payandSettle/capitalAccounts/accountLists/applyWithdraw.tsx
View file @
b24e8ce3
...
@@ -173,7 +173,7 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -173,7 +173,7 @@ const AccountDetail: React.FC<{}> = () => {
</
div
>
</
div
>
</
div
>
</
div
>
<
div
className=
{
styles
[
'repayment-right'
]
}
>
<
div
className=
{
styles
[
'repayment-right'
]
}
>
<
Button
ghost
onClick=
{
handleSubmitApply
}
loading=
{
btnLoading
}
>
提交
</
Button
>
<
Button
ghost
onClick=
{
handleSubmitApply
}
loading=
{
btnLoading
}
disabled=
{
bankDetail
?
false
:
true
}
>
提交
</
Button
>
</
div
>
</
div
>
</
div
>
</
div
>
</
Col
>
</
Col
>
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/invoiceModal/index.tsx
View file @
b24e8ce3
src/pages/transaction/purchaseOrder/orderCollect/components/invoiceModal/schema.ts
View file @
b24e8ce3
...
@@ -12,11 +12,12 @@ const addressSchema: ISchema = {
...
@@ -12,11 +12,12 @@ const addressSchema: ISchema = {
labelAlign
:
'left'
,
labelAlign
:
'left'
,
labelCol
:
4
,
labelCol
:
4
,
wrapperCol
:
20
,
wrapperCol
:
20
,
full
:
true
full
:
true
,
},
},
properties
:
{
properties
:
{
type
:
{
type
:
{
type
:
'radio'
,
type
:
'radio'
,
required
:
true
,
title
:
'开具类型'
,
title
:
'开具类型'
,
enum
:
[
enum
:
[
{
{
...
@@ -29,12 +30,6 @@ const addressSchema: ISchema = {
...
@@ -29,12 +30,6 @@ const addressSchema: ISchema = {
}
}
],
],
default
:
1
,
default
:
1
,
"x-rules"
:
[
{
required
:
true
,
message
:
'请选择开具类型'
},
],
"x-linkages"
:
[
"x-linkages"
:
[
{
{
type
:
'value:visible'
,
type
:
'value:visible'
,
...
@@ -45,6 +40,7 @@ const addressSchema: ISchema = {
...
@@ -45,6 +40,7 @@ const addressSchema: ISchema = {
},
},
kind
:
{
kind
:
{
type
:
'radio'
,
type
:
'radio'
,
required
:
true
,
title
:
'发票种类'
,
title
:
'发票种类'
,
enum
:
[
enum
:
[
{
{
...
@@ -57,39 +53,35 @@ const addressSchema: ISchema = {
...
@@ -57,39 +53,35 @@ const addressSchema: ISchema = {
}
}
],
],
default
:
1
,
default
:
1
,
"x-rules"
:
[
{
required
:
true
,
message
:
'请选择开具类型'
}
]
},
},
invoiceTitle
:
{
invoiceTitle
:
{
type
:
'string'
,
type
:
'string'
,
required
:
true
,
title
:
'发票抬头'
,
title
:
'发票抬头'
,
"x-rules"
:
[
"x-rules"
:
[
{
{
required
:
true
,
message
:
'请输入发票抬头'
},
{
limitByte
:
true
,
limitByte
:
true
,
maxByte
:
40
maxByte
:
40
},
},
{
required
:
true
,
message
:
'请输入发票抬头'
}
]
]
},
},
taxNo
:
{
taxNo
:
{
type
:
'string'
,
type
:
'string'
,
required
:
true
,
title
:
'纳税号'
,
title
:
'纳税号'
,
"x-rules"
:
[
"x-rules"
:
[
{
{
required
:
true
,
message
:
'请输入纳税号'
},
{
limitByte
:
true
,
limitByte
:
true
,
maxByte
:
20
maxByte
:
20
},
},
{
required
:
true
,
message
:
'请输入纳税号'
}
]
]
},
},
bankOfDeposit
:
{
bankOfDeposit
:
{
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx
View file @
b24e8ce3
...
@@ -138,7 +138,12 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
...
@@ -138,7 +138,12 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
const
handleConfirmProduct
=
async
()
=>
{
const
handleConfirmProduct
=
async
()
=>
{
// 判断所选择的商品是否属于同一个工作流
// 判断所选择的商品是否属于同一个工作流
const
res
=
await
PublicApi
.
postOrderIsWorkFlow
({
memberId
:
rowSelectionCtl
.
selectRow
[
0
].
memberId
,
productIds
:
rowSelectionCtl
.
selectedRowKeys
},
{
ctlType
:
'none'
})
const
res
=
await
PublicApi
.
postOrderIsWorkFlow
({
memberId
:
rowSelectionCtl
.
selectRow
[
0
].
memberId
,
memberRoleId
:
rowSelectionCtl
.
selectRow
[
0
].
memberRoleId
,
productIds
:
rowSelectionCtl
.
selectedRowKeys
,
orderModel
:
schemaAction
.
getFieldValue
(
'orderModel'
)
},
{
ctlType
:
'none'
})
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
const
productData
=
schemaAction
.
getFieldValue
(
'orderProductRequests'
)
const
productData
=
schemaAction
.
getFieldValue
(
'orderProductRequests'
)
...
...
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