Commit f27bcc2e authored by 武广's avatar 武广

fix: 去除已参与活动

parent cfd1f819
......@@ -18,7 +18,6 @@ const SaleDateModal = props => {
// 提交
const handleConfirm = async () => {
const res = await form.validateFields();
console.log('res :>> ', res);
const params = {
id: props.id,
sort: res.sort,
......
......@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
import { Select, Modal, Table, Input, Button, Pagination, notification } from 'antd';
import { SearchOutlined } from '@ant-design/icons';
import { apiSelGoodsList, apiSelVirtualGoodsList, apiShopListByPickSelfID } from '../service';
import { getShopListByPickSelf } from '../service/bll';
import { SelectGoodsColumn, productType, weekOptions } from '../staticData/goods';
import style from '../style/index.less';
import { jsonToArray, deepClone } from '@/utils/utils';
......@@ -24,9 +23,6 @@ const SaleDateModal = props => {
const [selectedRows, setSelectedRows] = useState(props.selectedRows || []);
const searchList = async params => {
console.log('params :>> ', params);
console.log('searchType :>> ', searchType);
console.log('shopId :>> ', shopId);
const { enterpriseId } = props;
const searchObj = {};
if (searchKeyword && searchType && !params.search) {
......@@ -144,8 +140,6 @@ const SaleDateModal = props => {
const onSelectAllChange = (selected, rows) => {
const keys = [...selectedRowKeys];
const arr = [...selectedRows];
console.log('selected :>> ', selected);
console.log('rows :>> ', rows);
if (selected) {
rows.forEach(item => {
if (item && !keys.includes(item.skuId)) {
......@@ -185,16 +179,13 @@ const SaleDateModal = props => {
pickSelfIdList: props.pickSelfIdList,
});
if (res && res.data) {
console.log('getShopList res :>> ', res);
setShopList(
res.data.map(item => ({
label: item.name,
value: item.id,
})),
);
// searchList({});
}
// setShopList(res);
};
const rowSelection = {
......@@ -238,7 +229,6 @@ const SaleDateModal = props => {
setShopName(props.shopName);
searchList({});
}
// setGoodsType(props.productType);
}, []);
return (
......
import debounce from 'lodash/debounce';
import { apiEnterpriseList, apiShopList, apiShopListByPickSelfID } from './index';
// 获取企业列表
......
......@@ -447,13 +447,13 @@ export const SelectGoodsColumn = [
return '-';
},
},
{
title: '已参与活动',
dataIndex: 'activity',
align: 'center',
width: 110,
hideInSearch: true,
},
// {
// title: '已参与活动',
// dataIndex: 'activity',
// align: 'center',
// width: 110,
// hideInSearch: true,
// },
];
// 企业虚拟商品列表字段
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment