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

src/pages/productManage/material/common/searchTableSchema.tsx

@@ -4,8 +4,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
 
 const intl = getIntl();
 
-type Options = { 
-  showStatus: boolean 
+type Options = {
+  showStatus: boolean
 }
 
 export const getSchema = (options: Options) => {
@@ -49,36 +49,36 @@ export const getSchema = (options: Options) => {
                 type: 'string',
                 'x-component-props': {
                   placeholder: intl.formatMessage({ id: 'material.name', defaultMessage: '物料名称' }),
-                  allowClear: true, 
+                  allowClear: true,
                 },
-              }, 
+              },
               materialGroupId: {
                 type: 'string',
                 // 'x-component': 'Cascader',
                 'x-component-props': {
                   placeholder: intl.formatMessage({ id: 'material.group.title', defaultMessage: '物料组'}),
-                  allowClear: true, 
+                  allowClear: true,
                   fieldNames: { label: 'title', value: 'id', children: 'children' },
                   style: { width: '150px' },
                   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',
                 'x-component-props': {
                   placeholder: intl.formatMessage({ id: 'material.category', defaultMessage: '品类' }),
-                  allowClear: true, 
+                  allowClear: true,
                   style: { width: '150px' },
                   showSearch: true,
                   fieldNames: { label: 'title', value: 'id', children: 'children' },
@@ -89,7 +89,7 @@ export const getSchema = (options: Options) => {
                 visible: options.showStatus,
                 'x-component-props': {
                   placeholder: intl.formatMessage({ id: 'material.interiorStateName', defaultMessage: '内部状态' }),
-                  allowClear: true, 
+                  allowClear: true,
                   enum: [],
                 },
               },

src/pages/productManage/material/materialQuery/index.tsx

@@ -134,7 +134,7 @@ const MaterialQuery = () => {
 
   /**
    * 冻结 0， 启动 1
-   * @param status 
+   * @param status
    */
   const handleBatchFrozen = async (status: 0 | 1, reason?: string) => {
     const selectedRowKeys = selectRowFns.selectedRowKeys;
@@ -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"])
               }}
             />
@@ -253,4 +253,4 @@ const MaterialQuery = () => {
   )
 }
 
-export default MaterialQuery
\ No newline at end of file
+export default MaterialQuery