Skip to content

J
jinfa-admin
Commit 3c12f58a authored by shenshaokai's avatar shenshaokai
Browse files
Options

Merge branch 'jinfa-20221102' into 'jinfa-20221102'

fix: 待审核物料-隐藏高级筛选-品牌 See merge request project/jinfa-admin!26
parents af7536b0 57f8914a
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
src/pages/productManage/material/common/searchTableSchema.tsx
View file @ 3c12f58a
......@@ -63,16 +63,16 @@ export const getSchema = (options: Options) => {
showSearch: true
},
},
brandId: {
type: 'string',
enum: [],
'x-component-props': {
placeholder: intl.formatMessage({ id: 'material.brand', defaultMessage: '品牌' }),
allowClear: true,
showSearch: true,
style: { width: '150px' },
},
},
// brandId: {
// type: 'string',
// enum: [],
// 'x-component-props': {
// placeholder: intl.formatMessage({ id: 'material.brand', defaultMessage: '品牌' }),
// allowClear: true,
// showSearch: true,
// style: { width: '150px' },
// },
// },
customerCategoryId: {
type: 'string',
// 'x-component': 'Cascader',
......
src/pages/productManage/material/materialQuery/index.tsx
View file @ 3c12f58a
......@@ -235,7 +235,7 @@ const MaterialQuery = () => {
useStateFilterSearchLinkageEffect($, actions, 'code', FORM_FILTER_PATH);
useAsyncCascader('materialGroupId', fetchTreeData)
useAsyncCascader('customerCategoryId', fetchCategoryData)
useAsyncSelect('brandId', fetchBrand, ["name", "id"])
// useAsyncSelect('brandId', fetchBrand, ["name", "id"])
useAsyncSelect('status', fetchStatus, ["name", "status"])
}}
/>
......
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