Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
f27bcc2e
Commit
f27bcc2e
authored
Jun 15, 2023
by
武广
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 去除已参与活动
parent
cfd1f819
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
19 deletions
+7
-19
GoodSortModal.jsx
src/pages/businessGoods/components/GoodSortModal.jsx
+0
-1
SelectGoodsModal.jsx
src/pages/businessGoods/components/SelectGoodsModal.jsx
+0
-10
bll.js
src/pages/businessGoods/service/bll.js
+0
-1
goods.js
src/pages/businessGoods/staticData/goods.js
+7
-7
No files found.
src/pages/businessGoods/components/GoodSortModal.jsx
View file @
f27bcc2e
...
@@ -18,7 +18,6 @@ const SaleDateModal = props => {
...
@@ -18,7 +18,6 @@ const SaleDateModal = props => {
// 提交
// 提交
const
handleConfirm
=
async
()
=>
{
const
handleConfirm
=
async
()
=>
{
const
res
=
await
form
.
validateFields
();
const
res
=
await
form
.
validateFields
();
console
.
log
(
'
res :>>
'
,
res
);
const
params
=
{
const
params
=
{
id
:
props
.
id
,
id
:
props
.
id
,
sort
:
res
.
sort
,
sort
:
res
.
sort
,
...
...
src/pages/businessGoods/components/SelectGoodsModal.jsx
View file @
f27bcc2e
...
@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
...
@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
import
{
Select
,
Modal
,
Table
,
Input
,
Button
,
Pagination
,
notification
}
from
'
antd
'
;
import
{
Select
,
Modal
,
Table
,
Input
,
Button
,
Pagination
,
notification
}
from
'
antd
'
;
import
{
SearchOutlined
}
from
'
@ant-design/icons
'
;
import
{
SearchOutlined
}
from
'
@ant-design/icons
'
;
import
{
apiSelGoodsList
,
apiSelVirtualGoodsList
,
apiShopListByPickSelfID
}
from
'
../service
'
;
import
{
apiSelGoodsList
,
apiSelVirtualGoodsList
,
apiShopListByPickSelfID
}
from
'
../service
'
;
import
{
getShopListByPickSelf
}
from
'
../service/bll
'
;
import
{
SelectGoodsColumn
,
productType
,
weekOptions
}
from
'
../staticData/goods
'
;
import
{
SelectGoodsColumn
,
productType
,
weekOptions
}
from
'
../staticData/goods
'
;
import
style
from
'
../style/index.less
'
;
import
style
from
'
../style/index.less
'
;
import
{
jsonToArray
,
deepClone
}
from
'
@/utils/utils
'
;
import
{
jsonToArray
,
deepClone
}
from
'
@/utils/utils
'
;
...
@@ -24,9 +23,6 @@ const SaleDateModal = props => {
...
@@ -24,9 +23,6 @@ const SaleDateModal = props => {
const
[
selectedRows
,
setSelectedRows
]
=
useState
(
props
.
selectedRows
||
[]);
const
[
selectedRows
,
setSelectedRows
]
=
useState
(
props
.
selectedRows
||
[]);
const
searchList
=
async
params
=>
{
const
searchList
=
async
params
=>
{
console
.
log
(
'
params :>>
'
,
params
);
console
.
log
(
'
searchType :>>
'
,
searchType
);
console
.
log
(
'
shopId :>>
'
,
shopId
);
const
{
enterpriseId
}
=
props
;
const
{
enterpriseId
}
=
props
;
const
searchObj
=
{};
const
searchObj
=
{};
if
(
searchKeyword
&&
searchType
&&
!
params
.
search
)
{
if
(
searchKeyword
&&
searchType
&&
!
params
.
search
)
{
...
@@ -144,8 +140,6 @@ const SaleDateModal = props => {
...
@@ -144,8 +140,6 @@ const SaleDateModal = props => {
const
onSelectAllChange
=
(
selected
,
rows
)
=>
{
const
onSelectAllChange
=
(
selected
,
rows
)
=>
{
const
keys
=
[...
selectedRowKeys
];
const
keys
=
[...
selectedRowKeys
];
const
arr
=
[...
selectedRows
];
const
arr
=
[...
selectedRows
];
console
.
log
(
'
selected :>>
'
,
selected
);
console
.
log
(
'
rows :>>
'
,
rows
);
if
(
selected
)
{
if
(
selected
)
{
rows
.
forEach
(
item
=>
{
rows
.
forEach
(
item
=>
{
if
(
item
&&
!
keys
.
includes
(
item
.
skuId
))
{
if
(
item
&&
!
keys
.
includes
(
item
.
skuId
))
{
...
@@ -185,16 +179,13 @@ const SaleDateModal = props => {
...
@@ -185,16 +179,13 @@ const SaleDateModal = props => {
pickSelfIdList
:
props
.
pickSelfIdList
,
pickSelfIdList
:
props
.
pickSelfIdList
,
});
});
if
(
res
&&
res
.
data
)
{
if
(
res
&&
res
.
data
)
{
console
.
log
(
'
getShopList res :>>
'
,
res
);
setShopList
(
setShopList
(
res
.
data
.
map
(
item
=>
({
res
.
data
.
map
(
item
=>
({
label
:
item
.
name
,
label
:
item
.
name
,
value
:
item
.
id
,
value
:
item
.
id
,
})),
})),
);
);
// searchList({});
}
}
// setShopList(res);
};
};
const
rowSelection
=
{
const
rowSelection
=
{
...
@@ -238,7 +229,6 @@ const SaleDateModal = props => {
...
@@ -238,7 +229,6 @@ const SaleDateModal = props => {
setShopName
(
props
.
shopName
);
setShopName
(
props
.
shopName
);
searchList
({});
searchList
({});
}
}
// setGoodsType(props.productType);
},
[]);
},
[]);
return
(
return
(
...
...
src/pages/businessGoods/service/bll.js
View file @
f27bcc2e
import
debounce
from
'
lodash/debounce
'
;
import
{
apiEnterpriseList
,
apiShopList
,
apiShopListByPickSelfID
}
from
'
./index
'
;
import
{
apiEnterpriseList
,
apiShopList
,
apiShopListByPickSelfID
}
from
'
./index
'
;
// 获取企业列表
// 获取企业列表
...
...
src/pages/businessGoods/staticData/goods.js
View file @
f27bcc2e
...
@@ -447,13 +447,13 @@ export const SelectGoodsColumn = [
...
@@ -447,13 +447,13 @@ export const SelectGoodsColumn = [
return
'
-
'
;
return
'
-
'
;
},
},
},
},
{
//
{
title
:
'
已参与活动
'
,
//
title: '已参与活动',
dataIndex
:
'
activity
'
,
//
dataIndex: 'activity',
align
:
'
center
'
,
//
align: 'center',
width
:
110
,
//
width: 110,
hideInSearch
:
true
,
//
hideInSearch: true,
},
//
},
];
];
// 企业虚拟商品列表字段
// 企业虚拟商品列表字段
...
...
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