Commit 773b981e authored by 前端-许佳敏's avatar 前端-许佳敏

Merge branch 'dev' into test

parents 1016e1c0 c4483785
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
"antd-img-crop": "^3.12.0", "antd-img-crop": "^3.12.0",
"bizcharts": "^4.0.14", "bizcharts": "^4.0.14",
"copy-to-clipboard": "^3.3.1", "copy-to-clipboard": "^3.3.1",
"god": "^0.1.30", "god": "0.2.1",
"lingxi-design": "^1.0.8", "lingxi-design": "^1.0.8",
"lingxi-design-ui": "^1.1.10", "lingxi-design-ui": "^1.1.10",
"lingxi-editor-core": "^1.0.6", "lingxi-editor-core": "^1.0.6",
......
...@@ -234,7 +234,8 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => { ...@@ -234,7 +234,8 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => {
id: goodsId id: goodsId
}) })
// 设置货品名称 // 设置货品名称
addSchemaAction.setFieldValue('itemNo', data?.name || '') addSchemaAction.setFieldValue('goodsName', data?.name || '')
addSchemaAction.setFieldValue('goodsId', goodsId)
} }
} }
......
...@@ -215,12 +215,16 @@ export const repositMoreSchema: ISchema = padRequiredMessage({ ...@@ -215,12 +215,16 @@ export const repositMoreSchema: ISchema = padRequiredMessage({
title: '对应仓库名称', title: '对应仓库名称',
enum: [] enum: []
}, },
itemNo: { goodsName: {
type: 'string', type: 'string',
"x-component": 'Text', "x-component": 'Text',
title: '对应货品', title: '对应货品',
default: '暂无' default: '暂无'
}, },
goodsId: {
type: 'string',
display: false
},
inventory: { inventory: {
type: 'number', type: 'number',
"x-component": "CustomSlider", "x-component": "CustomSlider",
......
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