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
031da597
Commit
031da597
authored
Mar 02, 2022
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
c74564a9
fa1e1106
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
46 additions
and
23 deletions
+46
-23
commodity.ts
src/locales/zh-CN/commodity.ts
+1
-1
index.tsx
src/pages/editor/ownMallEdit/index.tsx
+2
-1
preview.tsx
src/pages/editor/ownMallEdit/preview.tsx
+2
-1
index.tsx
...eOrder/orderCollectB2b/components/selectAddress/index.tsx
+1
-1
index.tsx
...pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
+24
-11
index.tsx
...Order/orderCollectCash/components/selectAddress/index.tsx
+1
-1
index.tsx
...ages/transaction/purchaseOrder/orderCollectCash/index.tsx
+3
-3
index.tsx
...rderCollectRequisition/components/selectAddress/index.tsx
+1
-1
index.tsx
...eOrder/orderCollectSrm/components/selectAddress/index.tsx
+1
-1
index.tsx
...n/saleOrder/agentOrder/components/selectAddress/index.tsx
+1
-1
type.ts
src/utils/type.ts
+9
-1
No files found.
src/locales/zh-CN/commodity.ts
View file @
031da597
...
...
@@ -631,7 +631,7 @@ export default {
'commodity.products.addProductsItem.logisticsForm.form.weight.placeholder'
:
'请输入重量'
,
'commodity.products.addProductsItem.logisticsForm.form.useTemplate'
:
'使用运费模板(只有买家承担运费才能选择)'
,
'commodity.products.addProductsItem.logisticsForm.form.templateId'
:
'运费模板'
,
'commodity.products.addProductsItem.logisticsForm.form.templateId.message'
:
'请
正确输入重量
'
,
'commodity.products.addProductsItem.logisticsForm.form.templateId.message'
:
'请
选择运费模板
'
,
'commodity.products.addProductsItem.logisticsForm.form.templateId.placeholder'
:
'请选择运费模板'
,
'commodity.products.addProductsItem.logisticsForm.form.sendAddress'
:
'发货地址'
,
'commodity.products.addProductsItem.logisticsForm.form.sendAddress.message'
:
'请选择发货地址'
,
...
...
src/pages/editor/ownMallEdit/index.tsx
View file @
031da597
...
...
@@ -114,7 +114,8 @@ const OwnMallEdit: React.FC<ShopEditPropsType> = (props) => {
templateId
:
id
,
categoryId
,
memberId
,
roleId
:
memberRoleId
roleId
:
memberRoleId
,
shopId
,
}
getTemplateAdornWebSelfMemberCategoryAdorn
(
param
).
then
(
res
=>
{
...
...
src/pages/editor/ownMallEdit/preview.tsx
View file @
031da597
...
...
@@ -112,7 +112,8 @@ const OwnMallEdit: React.FC<ShopEditPropsType> = (props) => {
templateId
:
id
,
categoryId
,
memberId
,
roleId
:
memberRoleId
roleId
:
memberRoleId
,
shopId
,
}
getTemplateAdornWebSelfMemberCategoryAdorn
(
param
).
then
(
res
=>
{
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/components/selectAddress/index.tsx
View file @
031da597
...
...
@@ -118,7 +118,7 @@ const SelectAddress = (props: ISchemaFieldComponentProps) => {
<
div
style=
{
{
width
:
'100%'
}
}
>
<
SelectStyles
><
Row
gutter=
{
[
16
,
16
]
}
style=
{
{
width
:
'100%'
}
}
>
{
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
><
div
key=
{
v
.
id
}
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
key=
{
v
.
id
}
><
div
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
<
div
>
<
Row
style=
{
{
color
:
'#303133'
}
}
>
<
Col
>
{
v
.
receiverName
}
</
Col
>
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
View file @
031da597
...
...
@@ -456,17 +456,17 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = () => {
effects=
{
(
$
,
ctx
)
=>
{
useAsyncSelect
(
'orderMode'
,
fetchOrderMode
,
[
'text'
,
'id'
])
$
(
'onFormMount'
).
subscribe
(
async
()
=>
{
const
data
=
await
fectchShopListsSource
()
if
(
data
&&
data
.
length
)
{
ctx
.
setFieldState
(
'shopId'
,
state
=>
{
state
.
props
.
enum
=
data
.
map
(
item
=>
({
label
:
item
.
name
,
value
:
item
.
id
,
type
:
item
.
type
,
environment
:
item
.
environment
,
}))
})
}
//
const data = await fectchShopListsSource()
//
if(data && data.length)
{
//
ctx.setFieldState('shopId', state =>
{
//
state.props.enum = data.map(item => (
{
//
label: item.name,
//
value: item.id,
//
type: item.type,
//
environment: item.environment,
//
}))
//
})
//
}
if
(
id
||
modelType
)
{
ctx
.
setFieldState
(
'orderMode'
,
state
=>
{
state
.
editable
=
false
...
...
@@ -478,6 +478,19 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = () => {
})
}
})
// 供应商变动查询商城列表
$
(
'onFieldValueChange'
,
'vendorMemberId'
).
subscribe
(
async
state
=>
{
const
role
=
ctx
.
getFieldValue
(
'vendorRoleId'
)
const
data
=
await
fectchShopListsSource
({
environment
:
1
,
hasMemberType
:
1
,
memberId
:
state
.
value
,
roleId
:
role
})
ctx
.
setFieldState
(
'shopId'
,
prevState
=>
{
prevState
.
props
.
enum
=
data
.
map
(
item
=>
({
...
item
,
label
:
item
.
name
,
value
:
item
.
id
}))
})
})
$
(
'onFieldInputChange'
,
'orderMode'
).
subscribe
(
state
=>
{
const
{
value
}
=
state
// 处理商城类型选项 报价单文案 支付信息栏隐藏
...
...
src/pages/transaction/purchaseOrder/orderCollectCash/components/selectAddress/index.tsx
View file @
031da597
...
...
@@ -119,7 +119,7 @@ const SelectAddress = (props: ISchemaFieldComponentProps) => {
<
div
style=
{
{
width
:
'100%'
}
}
>
<
SelectStyles
><
Row
gutter=
{
[
16
,
16
]
}
style=
{
{
width
:
'100%'
}
}
>
{
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
><
div
key=
{
v
.
id
}
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
key=
{
v
.
id
}
><
div
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
<
div
>
<
Row
style=
{
{
color
:
'#303133'
}
}
>
<
Col
>
{
v
.
receiverName
}
</
Col
>
...
...
src/pages/transaction/purchaseOrder/orderCollectCash/index.tsx
View file @
031da597
...
...
@@ -29,6 +29,7 @@ import { useFormDetail } from '@/formSchema/effects/useFormDetail'
import
{
getLogisticsReceiverAddressGet
,
getLogisticsSelectListMemberShipperAddress
,
postLogisticsFreightTemplateCalFreightPrice
}
from
'@/services/LogisticsV2Api'
import
{
getOrderBuyerCreateDetail
,
postOrderBuyerCreatePurchase
,
postOrderBuyerCreatePurchaseUpdate
}
from
'@/services/OrderNewV2Api'
import
{
postManageWebShopWebAll
}
from
'@/services/ManageV2Api'
import
{
fectchShopListsSource
}
from
'@/utils/type'
export
interface
AgentOrderDetailProps
{}
...
...
@@ -410,13 +411,12 @@ const AgentOrderDetail:React.FC<AgentOrderDetailProps> = () => {
// 供应商变动查询商城列表
$
(
'onFieldValueChange'
,
'vendorMemberId'
).
subscribe
(
async
state
=>
{
const
role
=
ctx
.
getFieldValue
(
'vendorRoleId'
)
const
{
data
}
=
await
postManageWebShopWebAll
({
siteId
:
GlobalConfig
.
global
.
siteInfo
.
id
,
const
data
=
await
fectchShopListsSource
({
environment
:
1
,
hasMemberType
:
1
,
memberId
:
state
.
value
,
roleId
:
role
}
,
{
ctlType
:
"none"
}
)
})
ctx
.
setFieldState
(
'shopId'
,
prevState
=>
{
prevState
.
props
.
enum
=
data
.
map
(
item
=>
({
...
item
,
label
:
item
.
name
,
value
:
item
.
id
}))
})
...
...
src/pages/transaction/purchaseOrder/orderCollectRequisition/components/selectAddress/index.tsx
View file @
031da597
...
...
@@ -125,7 +125,7 @@ const SelectAddress = (props: ISchemaFieldComponentProps) => {
{
/* {editable && <Button block onClick={handleAdd} icon={<PlusOutlined />}>新建地址</Button>} */
}
<
SelectStyles
><
Row
gutter=
{
[
16
,
16
]
}
style=
{
{
width
:
'100%'
}
}
>
{
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
><
div
key=
{
v
.
id
}
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
key=
{
v
.
id
}
><
div
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
<
div
>
<
Row
style=
{
{
color
:
'#303133'
}
}
>
<
Col
>
{
v
.
receiverName
}
</
Col
>
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/components/selectAddress/index.tsx
View file @
031da597
...
...
@@ -124,7 +124,7 @@ const SelectAddress = (props: ISchemaFieldComponentProps) => {
{
/* {editable && <Button block onClick={handleAdd} icon={<PlusOutlined />}>新建地址</Button>} */
}
<
SelectStyles
><
Row
gutter=
{
[
16
,
16
]
}
style=
{
{
width
:
'100%'
}
}
>
{
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
><
div
key=
{
v
.
id
}
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
key=
{
v
.
id
}
><
div
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
<
div
>
<
Row
style=
{
{
color
:
'#303133'
}
}
>
<
Col
>
{
v
.
receiverName
}
</
Col
>
...
...
src/pages/transaction/saleOrder/agentOrder/components/selectAddress/index.tsx
View file @
031da597
...
...
@@ -121,7 +121,7 @@ const SelectAddress = (props: ISchemaFieldComponentProps) => {
{
/* {editable && <Button block onClick={handleAdd} icon={<PlusOutlined />}>新建地址</Button>} */
}
<
SelectStyles
><
Row
gutter=
{
[
16
,
16
]
}
style=
{
{
width
:
'100%'
}
}
>
{
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
><
div
key=
{
v
.
id
}
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
showDataSource
.
map
(
v
=>
<
Col
span=
{
12
}
key=
{
v
.
id
}
><
div
onClick=
{
()
=>
handleCheck
(
v
)
}
className=
{
cx
(
'select_style_border'
,
checkedId
===
v
.
id
?
'active'
:
''
)
}
>
<
div
>
<
Row
style=
{
{
color
:
'#303133'
}
}
>
<
Col
>
{
v
.
receiverName
}
</
Col
>
...
...
src/utils/type.ts
View file @
031da597
...
...
@@ -35,6 +35,14 @@ interface getShopListsParmasProps {
* 1 为是
*/
hasMemberType
?:
number
;
/**
* 会员ID
*/
memberId
?:
number
/**
* 角色ID
*/
roleId
?:
number
}
/**
...
...
@@ -42,7 +50,7 @@ interface getShopListsParmasProps {
* @param params 接口参数
*/
export
const
fectchShopListsSource
=
async
(
params
?:
getShopListsParmasProps
)
=>
{
if
(
postManageWebShopWebAll
Shop
)
{
if
(
postManageWebShopWebAll
)
{
const
{
data
}
=
await
postManageWebShopWebAll
({
...
params
,
siteId
:
GlobalConfig
.
global
.
siteInfo
.
id
},
{
ctlType
:
'none'
})
return
data
}
...
...
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