Commit 909cdb62 authored by shida.liu's avatar shida.liu

feat: 供货价

parent 87caf0b5
...@@ -202,7 +202,7 @@ class goodsManage extends Component { ...@@ -202,7 +202,7 @@ class goodsManage extends Component {
))} ))}
</Select> </Select>
</FormItem> </FormItem>
<FormItem label="供货价区间"> {/* <FormItem label="供货价区间">
<FormItem name="supplyPriceMin" className={styles.iptNumRight} noStyle> <FormItem name="supplyPriceMin" className={styles.iptNumRight} noStyle>
<InputNumber placeholder="请输入" min={0} max={999999999} style={iptNumWidth} /> <InputNumber placeholder="请输入" min={0} max={999999999} style={iptNumWidth} />
</FormItem> </FormItem>
...@@ -218,7 +218,7 @@ class goodsManage extends Component { ...@@ -218,7 +218,7 @@ class goodsManage extends Component {
onChange={this.valueMin} onChange={this.valueMin}
/> />
</FormItem> </FormItem>
</FormItem> </FormItem> */}
<FormItem name="thirdSkuNo" label="第三方SKU编码"> <FormItem name="thirdSkuNo" label="第三方SKU编码">
<Input placeholder="请输入第三方SKU编码" allowClear style={selectW} /> <Input placeholder="请输入第三方SKU编码" allowClear style={selectW} />
</FormItem> </FormItem>
......
...@@ -12,7 +12,7 @@ import React, { ...@@ -12,7 +12,7 @@ import React, {
memo, memo,
} from 'react'; } from 'react';
// import { unstable_batchedUpdates } from 'react-dom'; // import { unstable_batchedUpdates } from 'react-dom';
import { formItemLayout, StaticColumns } from '../config'; import { formItemLayout, StaticColumns, StaticColumnsPop } from '../config';
import EditFormTable from './EditFormTable'; import EditFormTable from './EditFormTable';
import FormPackage from './FormPackage'; import FormPackage from './FormPackage';
import { import {
...@@ -316,7 +316,13 @@ const FormPriceOrStock = forwardRef((props, ref) => { ...@@ -316,7 +316,13 @@ const FormPriceOrStock = forwardRef((props, ref) => {
inputType: 'text', inputType: 'text',
}); });
} }
const dynamicColumns = [...columsData, ...StaticColumns(customer)];
// isGoodsManage用来判断是否是popGoodsManage页面,这个页面是用来应付审计团队的,没有实际功能,这里删掉了供货价字段,正常业务逻辑不用考虑这个字段,这就用第一个数据就好了
const isGoodsManage = window.location.pathname.indexOf('popGoodsManage') < 0;
const dynamicColumns = [
...columsData,
...(isGoodsManage ? StaticColumns(customer) : StaticColumnsPop(customer)),
];
setDefaultColumns(dynamicColumns); setDefaultColumns(dynamicColumns);
}; };
......
This diff is collapsed.
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