Commit 352a6310 authored by 张子雨's avatar 张子雨

Merge branch 'feat/storeManagement' into feature/meal-3.0

* feat/storeManagement:
  feat: 优化
parents 38cd8bb3 70bceed1
...@@ -50,7 +50,7 @@ export const columns = props => [ ...@@ -50,7 +50,7 @@ export const columns = props => [
key: 'balanceBackFlag', key: 'balanceBackFlag',
dataIndex: 'balanceBackFlag', dataIndex: 'balanceBackFlag',
align: 'center', align: 'center',
render: _ => (_ ? '' : ''), render: _ => (_ ? '正常' : '已收回'),
}, },
{ {
title: '是否消费限额', title: '是否消费限额',
......
...@@ -122,6 +122,7 @@ const StoreManagement = () => { ...@@ -122,6 +122,7 @@ const StoreManagement = () => {
setSelectedRows([]); setSelectedRows([]);
break; break;
case 'rechargeDetails': case 'rechargeDetails':
setGenerateLog([]);
setRechargeDetailsVisible(false); setRechargeDetailsVisible(false);
break; break;
default: default:
......
...@@ -50,7 +50,7 @@ const AddModal = props => { ...@@ -50,7 +50,7 @@ const AddModal = props => {
label: item.shopName, label: item.shopName,
})); }));
setOptions(optionData); setOptions(optionData);
getSelectedList(); // getSelectedList();
} }
}; };
...@@ -66,7 +66,7 @@ const AddModal = props => { ...@@ -66,7 +66,7 @@ const AddModal = props => {
<Form.Item label="企业名称"> <Form.Item label="企业名称">
<span>{name}</span> <span>{name}</span>
</Form.Item> </Form.Item>
<Form.Item label="添加微店" name="shopIds" initialValue={selectList}> <Form.Item label="添加微店" name="shopIds">
<Select <Select
mode="multiple" mode="multiple"
allowClear allowClear
......
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