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

fix: 采购下单添加地址手机区号默认选中,价格管理选择商品列表添加shopId字段,处理仓位批量修改库存负数校验异常,招投标线下评标提交评标报告可手动输入

parent e7b6f472
......@@ -51,6 +51,7 @@ const ProductModal:React.FC<ProductModalProps> = (props) => {
...params,
type: shopInfo[0]["type"],
environment: shopInfo[0].environment,
shopId,
// priceTypeList: [1, 2],
})
return res.data
......
......@@ -74,7 +74,7 @@ export const EditableCell: React.FC<EditableCellProps> = ({
onPressEnter={save}
onBlur={save}
type="number"
disabled={!record['editable']}
// disabled={!record['editable']}
/>
</Form.Item>
}
......
......@@ -171,8 +171,8 @@ const Repositories: React.FC<{}> = () => {
message: '请填写仓位库存',
},
{
pattern: PATTERN_MAPS.weight,
message: '请填写正数,最多保留3位小数',
pattern: /^[+-]?\d*(\.\d{0,3})?$/,
message: '请填写数值,最多保留3位小数',
},
],
},
......
......@@ -85,7 +85,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
modalProps={{
destroyOnClose: true
}}
effects={($, { setFieldState }) => {
effects={($, { setFieldState, setFieldValue }) => {
$('onFormMount').subscribe(() => {
PublicApi.getManageAreaAll().then(res => {
if (res.code === 1000) {
......@@ -130,6 +130,12 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
);
useAsyncSelect('areaCode', fetchTelCode)
$('onFieldChange', 'areaCode').subscribe(result => {
if(result.props.enum.length) {
setFieldValue('areaCode', '86')
}
})
}}
currentRef={props.currentRef}
actions={addressSchemaAction}
......
......@@ -542,7 +542,7 @@ export const materialInfoColumns: any[] = [
dataIndex: 'relevanceProductId',
align: 'center',
key: 'relevanceProductId',
render: (t, r) => `${t}/${r.relevanceProductName}/${r.relevanceProductCategory}/${r.relevanceProductBrand}`
render: (t, r) => `${t}/${r.relevanceProductName || ''}/${r.relevanceProductCategory || ''}/${r.relevanceProductBrand || ''}`
},
{
title: '单价(元)',
......
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