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
linweijiong
jinfa-platform
Commits
59993466
Commit
59993466
authored
Dec 29, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
85d2aed3
18e35102
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
16 additions
and
19 deletions
+16
-19
index.tsx
src/pages/payandSettle/creditManage/quotaMenage/index.tsx
+1
-1
useOrderDetail.tsx
...ages/transaction/_public/order/effects/useOrderDetail.tsx
+0
-2
index.tsx
...ages/transaction/components/createElectronModal/index.tsx
+4
-4
index.tsx
src/pages/transaction/components/orderPayModal/index.tsx
+1
-0
index.tsx
...es/transaction/components/saleOrderProductTable/index.tsx
+0
-1
index.ts
...s/transaction/purchaseOrder/orderCollect/effects/index.ts
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+7
-7
usePaymentInfo.tsx
...ction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
+0
-2
index.tsx
...ion/stockSellStorage/bills/components/BillsForm/index.tsx
+2
-1
No files found.
src/pages/payandSettle/creditManage/quotaMenage/index.tsx
View file @
59993466
...
@@ -190,7 +190,7 @@ const QuotaMenage: React.FC = () => {
...
@@ -190,7 +190,7 @@ const QuotaMenage: React.FC = () => {
{
/* 授信状态为 正常 时可申请调额 */
}
{
/* 授信状态为 正常 时可申请调额 */
}
{
(
{
(
record
.
status
===
CREDIT_STATUS_NORMAL
&&
record
.
status
===
CREDIT_STATUS_NORMAL
&&
record
.
isCanApply
!!
record
.
isCanApply
)
&&
(
)
&&
(
<
Button
<
Button
type=
"link"
type=
"link"
...
...
src/pages/transaction/_public/order/effects/useOrderDetail.tsx
View file @
59993466
...
@@ -64,8 +64,6 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
...
@@ -64,8 +64,6 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
const
{
code
,
data
}
=
res
const
{
code
,
data
}
=
res
if
(
code
===
1000
)
{
if
(
code
===
1000
)
{
setPaylist
(
data
)
setPaylist
(
data
)
}
else
{
message
.
error
(
res
.
message
)
}
}
})
})
}
}
...
...
src/pages/transaction/components/createElectronModal/index.tsx
View file @
59993466
...
@@ -186,8 +186,8 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
...
@@ -186,8 +186,8 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
expressionScope=
{
{
expressionScope=
{
{
electronBtn
electronBtn
}
}
}
}
effects=
{
async
(
$
,
actions
)
=>
{
effects=
{
(
$
,
actions
)
=>
{
// $('onFormInit').subscribe(
() =>
{
$
(
'onFormInit'
).
subscribe
(
async
()
=>
{
if
(
data
.
isElectronicContract
===
1
)
{
if
(
data
.
isElectronicContract
===
1
)
{
// useAsyncSelect('contractTemplateId', async () => (await PublicApi.getOrderSelectListContractTemplate()).data, ['name', 'id']).then(()=>
{
// useAsyncSelect('contractTemplateId', async () => (await PublicApi.getOrderSelectListContractTemplate()).data, ['name', 'id']).then(()=>
{
// actions.setFieldValue("contractTemplateId", data.contractTemplateId)
// actions.setFieldValue("contractTemplateId", data.contractTemplateId)
...
@@ -205,7 +205,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
...
@@ -205,7 +205,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
}
}
}
else
{
}
else
{
actions
.
setFieldState
(
'usingElectronicContracts'
,
state
=>
{
actions
.
setFieldState
(
'usingElectronicContracts'
,
state
=>
{
//
state.value = 0
state
.
value
=
0
state
.
props
[
"x-component-props"
]
=
{
state
.
props
[
"x-component-props"
]
=
{
disabled
:
true
disabled
:
true
}
}
...
@@ -215,7 +215,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
...
@@ -215,7 +215,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
$
(
'onFieldValueChange'
,
'contractTemplateId'
).
subscribe
(
state
=>
{
$
(
'onFieldValueChange'
,
'contractTemplateId'
).
subscribe
(
state
=>
{
// console.log(state.props)
// console.log(state.props)
})
})
//
})
})
}
}
}
}
/>
/>
)
)
...
...
src/pages/transaction/components/orderPayModal/index.tsx
View file @
59993466
...
@@ -287,6 +287,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
...
@@ -287,6 +287,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
setOpenTimer
(
0
)
setOpenTimer
(
0
)
}
}
setCode
(
''
)
setCode
(
''
)
mobilePayFlag
.
current
=
0
}
}
const
handleSubmitPay
=
async
()
=>
{
const
handleSubmitPay
=
async
()
=>
{
...
...
src/pages/transaction/components/saleOrderProductTable/index.tsx
View file @
59993466
...
@@ -101,7 +101,6 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
...
@@ -101,7 +101,6 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
// 总计金额
// 总计金额
useEffect
(()
=>
{
useEffect
(()
=>
{
console
.
log
((
sumPrice
*
1000
)
/
1000
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
,
'iiiiii'
)
setAmountMoney
(()
=>
(
sumPrice
*
1000
)
/
1000
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
)
setAmountMoney
(()
=>
(
sumPrice
*
1000
)
/
1000
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
)
},
[
sum
,
freePrice
,
sumPrice
])
},
[
sum
,
freePrice
,
sumPrice
])
...
...
src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts
View file @
59993466
...
@@ -184,7 +184,7 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
...
@@ -184,7 +184,7 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
},
{}),
},
{}),
isMemberPrice
:
v
.
isMemberPrice
,
isMemberPrice
:
v
.
isMemberPrice
,
purchaseCount
:
v
.
count
,
purchaseCount
:
v
.
count
,
money
:
v
.
count
*
v
.
unitPrice
,
money
:
v
.
memberDiscount
?
(
v
.
count
*
1000
*
v
.
unitPrice
*
100
*
v
.
memberDiscount
*
100
)
/
10000000
:
(
v
.
count
*
1000
*
v
.
unitPrice
*
100
)
/
100000
,
productId
:
v
.
id
,
productId
:
v
.
id
,
memberId
:
initValue
.
supplyMembersId
,
// 添加 memberId 字段
memberId
:
initValue
.
supplyMembersId
,
// 添加 memberId 字段
commodityId
:
v
.
id
,
// 添加commodityId用于判断是商品价格是使用price字段还是unitPrice字段(也可判断是报价订单还是其他)
commodityId
:
v
.
id
,
// 添加commodityId用于判断是商品价格是使用price字段还是unitPrice字段(也可判断是报价订单还是其他)
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
59993466
...
@@ -212,35 +212,35 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
...
@@ -212,35 +212,35 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
// theInvoiceInfo: value.theInvoiceInfo
// theInvoiceInfo: value.theInvoiceInfo
}
}
// 校验是否选择支付渠道/支付比例
// 校验是否选择支付渠道/支付比例
let
judgementByPay
=
params
.
paymentInformationResponses
.
map
(
item
=>
{
let
judgementByPay
=
params
.
paymentInformationResponses
?.
length
&&
params
.
paymentInformationResponses
.
map
(
item
=>
{
if
(
item
.
channel
&&
item
.
payWay
){
if
(
item
.
channel
&&
item
.
payWay
){
return
true
return
true
}
else
{
}
else
{
return
false
return
false
}
}
})
})
if
(
judgementByPay
.
includes
(
false
)){
if
(
!
judgementByPay
||
judgementByPay
.
includes
(
false
)){
throw
new
Error
(
'请选择支付方式或支付渠道'
)
throw
new
Error
(
'请选择支付方式或支付渠道'
)
}
}
let
judgementByRatio
=
params
.
paymentInformationResponses
.
map
(
item
=>
{
let
judgementByRatio
=
params
.
paymentInformationResponses
?.
length
&&
params
.
paymentInformationResponses
.
map
(
item
=>
{
if
(
Number
(
item
.
payRatio
)
>
0
&&
Number
(
item
.
payRatio
)
<=
100
){
if
(
Number
(
item
.
payRatio
)
>
0
&&
Number
(
item
.
payRatio
)
<=
100
){
return
true
return
true
}
else
{
}
else
{
return
false
return
false
}
}
})
})
if
(
judgementByRatio
.
includes
(
false
)){
if
(
!
judgementByRatio
||
judgementByRatio
.
includes
(
false
)){
throw
new
Error
(
'请正确填写支付比例
(0-100范围内)
'
)
throw
new
Error
(
'请正确填写支付比例'
)
}
}
// 校验采购数量
// 校验采购数量
let
judgementByCount
=
params
.
orderProductRequests
.
map
(
item
=>
{
let
judgementByCount
=
params
.
orderProductRequests
?.
length
&&
params
.
orderProductRequests
.
map
(
item
=>
{
if
(
item
.
purchaseCount
){
if
(
item
.
purchaseCount
){
return
true
return
true
}
else
{
}
else
{
return
false
return
false
}
}
})
})
if
(
judgementByCount
.
includes
(
false
)){
if
(
!
judgementByCount
||
judgementByCount
.
includes
(
false
)){
throw
new
Error
(
'请填写商品采购数量'
)
throw
new
Error
(
'请填写商品采购数量'
)
}
}
// logistics render字段字符串化
// logistics render字段字符串化
...
...
src/pages/transaction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
View file @
59993466
...
@@ -116,8 +116,6 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
...
@@ -116,8 +116,6 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
paywayData
.
current
=
data
paywayData
.
current
=
data
restrictArrivalPay
(
newColumns
,
orderProducts
)
restrictArrivalPay
(
newColumns
,
orderProducts
)
setColumns
(
newColumns
)
setColumns
(
newColumns
)
}
else
{
message
.
error
(
res
.
message
)
}
}
})
})
}
}
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx
View file @
59993466
...
@@ -168,7 +168,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
...
@@ -168,7 +168,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
// 单据数量,需要判断是 入库 还是 发货 单 匹配对应的字段值
// 单据数量,需要判断是 入库 还是 发货 单 匹配对应的字段值
productCount
:
transforDirection
(
rest
.
invoicesTypeId
)
?
item
.
storageCount
:
item
.
shipmentQuantity
,
productCount
:
transforDirection
(
rest
.
invoicesTypeId
)
?
item
.
storageCount
:
item
.
shipmentQuantity
,
product
:
item
.
productId
,
product
:
item
.
productId
,
amount
:
`¥
${(
+
item
.
productCount
*
item
.
price
).
toFixed
(
2
)}
`
,
amount
:
`¥
${(
transforDirection
(
rest
.
invoicesTypeId
)
?
item
.
storageCount
:
item
.
shipmentQuantity
*
item
.
price
).
toFixed
(
2
)}
`
,
extraData
:
{
extraData
:
{
productName
:
item
.
productName
,
productName
:
item
.
productName
,
deliveryType
,
deliveryType
,
...
@@ -1657,6 +1657,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
...
@@ -1657,6 +1657,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
<
Card
>
<
Card
>
<
NiceForm
<
NiceForm
value=
{
billInfo
}
value=
{
billInfo
}
previewPlaceholder=
" "
expressionScope=
{
{
expressionScope=
{
{
TableAddButton
,
TableAddButton
,
renderListTableRemove
,
renderListTableRemove
,
...
...
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