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

fix: 处理新增采购招标合同物料id没有取goodsId的问题

parent 890e9e54
...@@ -38,7 +38,7 @@ export const channelSchema: ISchema = { ...@@ -38,7 +38,7 @@ export const channelSchema: ISchema = {
'x-component': 'flex-layout', 'x-component': 'flex-layout',
'x-component-props': { 'x-component-props': {
rowStyle: { rowStyle: {
flexWrap: 'nowrap', flexWrap: 'wrap',
}, },
colStyle: { colStyle: {
marginLeft: 20, marginLeft: 20,
...@@ -48,21 +48,22 @@ export const channelSchema: ISchema = { ...@@ -48,21 +48,22 @@ export const channelSchema: ISchema = {
productId: { productId: {
type: 'string', type: 'string',
'x-component-props': { 'x-component-props': {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.productSchema.productId' }) placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.productSchema.productId' }),
style: { width: 174 },
} }
}, },
memberName: { memberName: {
type: 'string', type: 'string',
'x-component-props': { 'x-component-props': {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.memberName' }), placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.memberName' }),
style: { width: 100 }, style: { width: 174 },
}, },
}, },
memberRoleName: { memberRoleName: {
type: 'string', type: 'string',
'x-component-props': { 'x-component-props': {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.memberRoleName' }), placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.memberRoleName' }),
style: { width: 100 }, style: { width: 174 },
}, },
}, },
brandId: { brandId: {
...@@ -75,7 +76,7 @@ export const channelSchema: ISchema = { ...@@ -75,7 +76,7 @@ export const channelSchema: ISchema = {
defaultActiveFirstOption: false, defaultActiveFirstOption: false,
filterOption: false, filterOption: false,
notFoundContent: null, notFoundContent: null,
style: { width: 100 }, style: { width: 174 },
searchValue: null, searchValue: null,
dataoption: [], dataoption: [],
}, },
...@@ -87,7 +88,7 @@ export const channelSchema: ISchema = { ...@@ -87,7 +88,7 @@ export const channelSchema: ISchema = {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.customerCategoryId' }), placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.customerCategoryId' }),
showSearch: true, showSearch: true,
notFoundContent: null, notFoundContent: null,
style: { width: '174px' }, style: { width: 174 },
dataoption: [], dataoption: [],
fieldNames: { label: 'title', value: 'id', children: 'children' }, fieldNames: { label: 'title', value: 'id', children: 'children' },
}, },
...@@ -106,7 +107,7 @@ export const channelSchema: ISchema = { ...@@ -106,7 +107,7 @@ export const channelSchema: ISchema = {
], ],
'x-component-props': { 'x-component-props': {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.source.placeholder' }), placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.source.placeholder' }),
style: { width: 100 }, style: { width: 174 },
}, },
}, },
statusList: { statusList: {
...@@ -127,7 +128,7 @@ export const channelSchema: ISchema = { ...@@ -127,7 +128,7 @@ export const channelSchema: ISchema = {
], ],
'x-component-props': { 'x-component-props': {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.statusList.placeholder' }), placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.statusList.placeholder' }),
style: { width: 100 }, style: { width: 174 },
}, },
}, },
// priceTypeList: { // priceTypeList: {
...@@ -156,6 +157,7 @@ export const channelSchema: ISchema = { ...@@ -156,6 +157,7 @@ export const channelSchema: ISchema = {
'x-component': 'NumberRange', 'x-component': 'NumberRange',
'x-component-props': { 'x-component-props': {
placeholder: [getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.min' }), getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.max' })], placeholder: [getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.min' }), getIntl().formatMessage({ id: 'commodity.products.schema.channelSchema.max' })],
style: { width: '230px' },
}, },
}, },
submit: { submit: {
......
...@@ -125,7 +125,7 @@ const FormList = (props: any) => { ...@@ -125,7 +125,7 @@ const FormList = (props: any) => {
if (res.code === 1000) { if (res.code === 1000) {
let data = res.data.data.map((item, index) => { let data = res.data.data.map((item, index) => {
return { return {
materielId: _filterArr(sourceType, item, ['', 'goodsId', 'id', '']), materielId: _filterArr(sourceType, item, ['', 'goodsId', 'goodsId', '']),
code: _filter(sourceType, item, ['', 'number', 'code', 'number']),// 物料编号 code: _filter(sourceType, item, ['', 'number', 'code', 'number']),// 物料编号
name: _filter(sourceType, item, ['', 'name', 'name', 'name']),//物料名称 name: _filter(sourceType, item, ['', 'name', 'name', 'name']),//物料名称
type: _filter(sourceType, item, ['', 'model', 'type', 'model']),//物料规格 type: _filter(sourceType, item, ['', 'model', 'type', 'model']),//物料规格
......
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