Commit 69fc566b authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

Merge branch 'zwpFix' into dev

parents ff4b6d6c 032cb074
......@@ -161,7 +161,7 @@ const ClassProperty: React.FC<{}> = () => {
const syncIds = syncTreeActions.getSelectKeys()
if(syncIds.length) {
// @ts-ignore
PublicApi.postProductCustomerSyncCategory({idList: syncIds}).then(res => {
PublicApi.postProductCustomerSyncCategory({idList: syncIds.concat(syncTreeActions.getExpandedKeys()[0])}).then(res => {
resetMenu()
syncTreeActions.setSelectKeys([])
setResetSearch(true)
......
......@@ -320,7 +320,7 @@ const Goods: React.FC<{}> = () => {
>
<PlusOutlined />新建
</Button>
<Button style={{ margin: '0 16px' }} onClick={() => setImportModal(true)}>导入数据</Button>
{/* <Button style={{ margin: '0 16px' }} onClick={() => setImportModal(true)}>导入数据</Button> */}
<Dropdown overlay={menuMore} trigger={['click']}>
<Button>
更多 <DownOutlined />
......
......@@ -219,6 +219,12 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
deliveryType !== 3 && <Form.Item
name="sendAddress"
label="发货地址"
rules={[
{
required: true,
message: '请选择发货地址'
},
]}
>
<Select
placeholder="请选择发货地址"
......
......@@ -544,9 +544,9 @@ const Products: React.FC<{}> = () => {
<Menu.Item key="1" icon={<DeleteOutlined />}>
批量删除
</Menu.Item>
<Menu.Item key="2" icon={<DeleteOutlined />}>
{/* <Menu.Item key="2" icon={<DeleteOutlined />}>
删除导入批次
</Menu.Item>
</Menu.Item> */}
</Menu>
)
......@@ -558,7 +558,7 @@ const Products: React.FC<{}> = () => {
>
<PlusOutlined />新建
</Button>
<Button style={{margin:'0 16px'}} onClick={()=>setImportModal(true)}>导入数据</Button>
{/* <Button style={{margin:'0 16px'}} onClick={()=>setImportModal(true)}>导入数据</Button> */}
<Dropdown overlay={menuMore} trigger={['click']}>
<Button>
更多 <DownOutlined />
......
......@@ -72,7 +72,8 @@ const warehouseColumns: any[] = [
dataIndex: 'reductionInventory',
key: 'reductionInventory',
title: '扣减仓位库存',
align: 'center'
align: 'center',
render: (t, r) => r.type === 4 ? `-${t}` : `+${t}`
},
{
dataIndex: 'createTime',
......
......@@ -77,7 +77,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
}, [sum, freePrice])
useEffect(() => {
// 存在商品 并且有选择收货地址,则开始计算运费
// 存在商品 并且有选择收货地址,则开始计算运费,此外 收货方式变动也要重新计算
if (data && data.length > 0 && receiverAddressId) {
// 筛选配送方式为物流的商品并且使用了运费模板
const logsiticsDataMaps = data.filter(v => v.logistics && v.logistics.useTemplate && v.logistics.deliveryType === 1)
......@@ -98,7 +98,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
setFreePrice(0)
}
}
}, [data])
}, [data, receiverAddressId])
return <RowStyle>
......
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