Commit f27bcc2e authored by 武广's avatar 武广

fix: 去除已参与活动

parent cfd1f819
...@@ -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,
......
...@@ -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 (
......
import debounce from 'lodash/debounce';
import { apiEnterpriseList, apiShopList, apiShopListByPickSelfID } from './index'; import { apiEnterpriseList, apiShopList, apiShopListByPickSelfID } from './index';
// 获取企业列表 // 获取企业列表
......
...@@ -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,
}, // },
]; ];
// 企业虚拟商品列表字段 // 企业虚拟商品列表字段
......
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