Commit 24857759 authored by rainbowmorel@163.com's avatar rainbowmorel@163.com

fixed 二级BUG

parent 0a801a24
......@@ -878,6 +878,7 @@ export default {
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialCode' : 'Material number',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialName' : 'Material name',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.type':'Specification Model',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialGroup':'materialGroup',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.customerCategory':'Category',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.brand':'Brand',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.costPrice':'list price',
......
......@@ -879,6 +879,7 @@ export default {
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialCode' : '재료 번호',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialName' : '재료 이름',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.type' : '사양 모델',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialGroup':'자재반',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.customerCategory' : '종류',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.brand' : '브랜드',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.costPrice' : '정가',
......
......@@ -888,6 +888,7 @@ export default {
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialCode' : '物料编号',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialName' : '物料名称',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.type' : '规格型号',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialGroup':'物料组',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.customerCategory' : '品类',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.brand' : '品牌',
'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.costPrice' : '目录价',
......
......@@ -86,6 +86,11 @@ const SelectGoodsForm: React.FC<{}> = (props) => {
key: 'type',
},
{
title: intl.formatMessage({ id: 'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.materialGroup' }),
dataIndex: ['materialGroup', 'name'],
key: 'materialGroup',
},
{
title: intl.formatMessage({ id: 'commodity.products.addProductsItem.selectGoodsForm.goodsColumns.customerCategory' }),
dataIndex: ['customerCategory', 'name'],
key: 'customerCategory',
......
......@@ -144,6 +144,8 @@ const AnchorModal: React.FC<AnchorModalProps> = (props: any) => {
}
if (selectRow.length > 0) {
const data: any = selectRow[0]
console.log(data);
if (data.customerCategory) {
const fullId = data.customerCategory.fullId;
const ids = fullId.replace(/\b(0+)/gi, '').split('.');
......@@ -162,6 +164,7 @@ const AnchorModal: React.FC<AnchorModalProps> = (props: any) => {
model: data.type,
brand: data.brand && data.brand.name,
unit: data.unitName,
goodsGroup: data?.materialGroup?.name
})
setProduct(data);
setSearchVisible(false);
......
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