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
fbb7e9fb
Commit
fbb7e9fb
authored
Dec 02, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:处理新增仓位不指定会员也能提交,处理新增采购订单开具发票个人和企业表单联动问题
parent
a8260a1d
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
32 additions
and
4 deletions
+32
-4
reset.less
src/global/styles/reset.less
+5
-0
logisticsForm.tsx
...ages/commodity/products/addProductsItem/logisticsForm.tsx
+5
-1
applyWithdraw.tsx
...yandSettle/capitalAccounts/accountLists/applyWithdraw.tsx
+4
-0
addRepository.tsx
src/pages/repositories/addRepository.tsx
+5
-1
index.less
src/pages/transaction/components/orderPayModal/index.less
+3
-0
index.tsx
src/pages/transaction/components/orderProductTable/index.tsx
+1
-1
index.tsx
...es/transaction/components/saleOrderProductTable/index.tsx
+1
-1
schema.ts
...chaseOrder/orderCollect/components/invoiceModal/schema.ts
+7
-0
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+1
-0
No files found.
src/global/styles/reset.less
View file @
fbb7e9fb
...
@@ -124,6 +124,11 @@
...
@@ -124,6 +124,11 @@
}
}
}
}
// 去除sogou浏览器自动加的密码软盘图标
input::-webkit-input-safebox-button{
display: none;
}
// 设置formitem的*号到字段label前
// 设置formitem的*号到字段label前
.ant-form-item-label>label.ant-form-item-required::before {
.ant-form-item-label>label.ant-form-item-required::before {
order: 10;
order: 10;
...
...
src/pages/commodity/products/addProductsItem/logisticsForm.tsx
View file @
fbb7e9fb
...
@@ -46,7 +46,11 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
...
@@ -46,7 +46,11 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
onRef
(
logisticsFormRef
)
onRef
(
logisticsFormRef
)
if
(
history
.
location
.
query
?.
id
){
if
(
history
.
location
.
query
?.
id
){
setDeliveryType
(
productInfoByEdit
.
logistics
?.
deliveryType
)
const
{
deliveryType
,
carriageType
,
useTemplate
}
=
productInfoByEdit
.
logistics
setDeliveryType
(
deliveryType
)
setCarriageType
(
carriageType
)
setIsTemplate
(
useTemplate
)
setTemplate
(
useTemplate
)
logisticsForm
.
setFieldsValue
(
productInfoByEdit
.
logistics
)
logisticsForm
.
setFieldsValue
(
productInfoByEdit
.
logistics
)
}
else
{
}
else
{
logisticsForm
.
setFieldsValue
({
deliveryType
:
1
,
carriageType
:
1
})
logisticsForm
.
setFieldsValue
({
deliveryType
:
1
,
carriageType
:
1
})
...
...
src/pages/payandSettle/capitalAccounts/accountLists/applyWithdraw.tsx
View file @
fbb7e9fb
...
@@ -33,7 +33,11 @@ const AccountDetail: React.FC<{}> = () => {
...
@@ -33,7 +33,11 @@ const AccountDetail: React.FC<{}> = () => {
setDetails
(
data
)
setDetails
(
data
)
if
(
code
===
1000
)
{
if
(
code
===
1000
)
{
let
bankRes
=
await
PublicApi
.
getSettleAccountsCorporateAccountConfig
({
memberId
:
data
.
memberId
+
''
})
let
bankRes
=
await
PublicApi
.
getSettleAccountsCorporateAccountConfig
({
memberId
:
data
.
memberId
+
''
})
if
(
bankRes
.
code
===
1000
)
{
setBankDetail
(
bankRes
.
data
)
setBankDetail
(
bankRes
.
data
)
}
else
{
message
.
error
(
bankRes
.
message
)
}
}
}
}
}
...
...
src/pages/repositories/addRepository.tsx
View file @
fbb7e9fb
import
React
,
{
useState
,
useRef
,
useEffect
}
from
'react'
import
React
,
{
useState
,
useRef
,
useEffect
}
from
'react'
import
{
history
}
from
'umi'
import
{
history
}
from
'umi'
import
{
Button
,
Form
,
Card
,
Modal
,
Select
,
Table
,
Checkbox
,
Row
,
Col
,
Tooltip
,
Slider
,
InputNumber
,
Avatar
}
from
'antd'
import
{
Button
,
Form
,
Card
,
Modal
,
Select
,
Table
,
Checkbox
,
Row
,
Col
,
Tooltip
,
Slider
,
InputNumber
,
Avatar
,
message
}
from
'antd'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
import
{
PlusOutlined
,
PlusOutlined
,
...
@@ -38,11 +38,15 @@ const AddRepository:React.FC<{}> = (props) => {
...
@@ -38,11 +38,15 @@ const AddRepository:React.FC<{}> = (props) => {
if
(
params
[
'applyMember'
])
{
if
(
params
[
'applyMember'
])
{
params
[
'applyMember'
]
=
params
[
'applyMember'
]
params
[
'applyMember'
]
=
params
[
'applyMember'
]
}
}
if
(
!
params
[
'isAllMemberShare'
]
&&
!
params
[
'applyMember'
]?.
length
)
{
message
.
error
(
'请选择指定会员'
)
}
else
{
await
PublicApi
.
postWarehouseFreightSpaceAdd
(
params
)
await
PublicApi
.
postWarehouseFreightSpaceAdd
(
params
)
setTimeout
(()
=>
{
setTimeout
(()
=>
{
history
.
goBack
(
-
1
)
history
.
goBack
(
-
1
)
},
1000
)
},
1000
)
}
}
}
return
(
return
(
<
PageHeaderWrapper
<
PageHeaderWrapper
...
...
src/pages/transaction/components/orderPayModal/index.less
View file @
fbb7e9fb
...
@@ -96,6 +96,9 @@
...
@@ -96,6 +96,9 @@
border: none!important;
border: none!important;
box-shadow: 0 0 0 0 #fff;
box-shadow: 0 0 0 0 #fff;
}
}
&::-webkit-input-safebox-button{
display: none;
}
}
}
}
}
...
...
src/pages/transaction/components/orderProductTable/index.tsx
View file @
fbb7e9fb
...
@@ -330,7 +330,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
...
@@ -330,7 +330,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
render
:
()
=>
'是'
render
:
()
=>
'是'
},
},
{
{
title
:
'金额'
,
title
:
creditsCommodity
?
'所需积分小计'
:
'金额'
,
dataIndex
:
'money'
,
dataIndex
:
'money'
,
align
:
'center'
,
align
:
'center'
,
key
:
'money'
,
key
:
'money'
,
...
...
src/pages/transaction/components/saleOrderProductTable/index.tsx
View file @
fbb7e9fb
...
@@ -431,7 +431,7 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
...
@@ -431,7 +431,7 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
render
:
()
=>
'是'
render
:
()
=>
'是'
},
},
{
{
title
:
'金额'
,
title
:
creditsCommodity
?
'所需积分小计'
:
'金额'
,
dataIndex
:
'money'
,
dataIndex
:
'money'
,
align
:
'center'
,
align
:
'center'
,
key
:
'money'
,
key
:
'money'
,
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/invoiceModal/schema.ts
View file @
fbb7e9fb
...
@@ -33,6 +33,13 @@ const addressSchema: ISchema = {
...
@@ -33,6 +33,13 @@ const addressSchema: ISchema = {
{
{
required
:
true
,
required
:
true
,
message
:
'请选择开具类型'
message
:
'请选择开具类型'
},
],
"x-linkages"
:
[
{
type
:
'value:visible'
,
target
:
'taxNo'
,
condition
:
"{{$value === 1}}"
}
}
]
]
},
},
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
fbb7e9fb
...
@@ -63,6 +63,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
...
@@ -63,6 +63,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
},
[
sum
,
freePrice
])
},
[
sum
,
freePrice
])
useEffect
(()
=>
{
useEffect
(()
=>
{
// 存在商品 并且有选择收货地址,则开始计算运费
// 存在商品 并且有选择收货地址,则开始计算运费
console
.
log
(
data
,
'ddd'
)
if
(
data
&&
data
.
length
>
0
&&
receiverAddressId
)
{
if
(
data
&&
data
.
length
>
0
&&
receiverAddressId
)
{
// 筛选配送方式为物流的商品并且使用了运费模板
// 筛选配送方式为物流的商品并且使用了运费模板
const
logsiticsDataMaps
=
data
.
filter
(
v
=>
v
.
logistics
&&
v
.
logistics
.
useTemplate
&&
v
.
logistics
.
deliveryType
===
1
)
const
logsiticsDataMaps
=
data
.
filter
(
v
=>
v
.
logistics
&&
v
.
logistics
.
useTemplate
&&
v
.
logistics
.
deliveryType
===
1
)
...
...
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