@bit-sun/business-component 3.0.0-alpha.20 → 3.0.0-alpha.21

package/dist/index.esm.js

@@ -8332,6 +8332,25 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
+    }, {
+      name: 'qp-mainBrandCode-in',
+      type: 'select',
+      label: '品牌',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
     }, {
       name: 'qp-accountingCode-in',
       type: 'select',
@@ -8367,11 +8386,15 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/store"), {
+      pageSize: 5000,
+      currentPage: 1
     })]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
-      formatSource(x, 2, 5, tableSearchForm);
-      formatSource(x, 3, 6, tableSearchForm);
+      formatSource(x, 2, 6, tableSearchForm);
+      formatSource(x, 3, 7, tableSearchForm);
+      formatSource(x, 4, 5, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择店铺',
@@ -9611,13 +9634,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     name: 'qp-skuName-like',
     label: 'SKU名称'
   }, {
-    name: 'qp-skcCode-like',
-    label: 'SKC编码',
-    type: 'multipleQueryInput'
-  }, {
-    name: 'qp-itemCode-like',
-    label: 'SPU编码',
-    type: 'multipleQueryInput'
+    name: 'qp-externalCode-like',
+    label: '外部SPU编码'
   }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
     name: 'qp-code-in',
     label: '商品条码',
@@ -9680,7 +9698,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       'ctl-withAuth': true
     },
     resType: 'list',
-    resPosition: isNoUseItemBarcode ? 4 : 5,
+    resPosition: isNoUseItemBarcode ? 3 : 4,
     resKeyValue: ['id', 'name']
   }, {
     url: "/items/category/queryCategoryTree",
@@ -9689,7 +9707,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       currentPage: 1
     },
     resType: 'treeList',
-    resPosition: isNoUseItemBarcode ? 5 : 6
+    resPosition: isNoUseItemBarcode ? 4 : 5
   }];
   var mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
   var props = {

package/dist/index.js

@@ -8354,6 +8354,25 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
+    }, {
+      name: 'qp-mainBrandCode-in',
+      type: 'select',
+      label: '品牌',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
     }, {
       name: 'qp-accountingCode-in',
       type: 'select',
@@ -8389,11 +8408,15 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/store"), {
+      pageSize: 5000,
+      currentPage: 1
     })]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
-      formatSource(x, 2, 5, tableSearchForm);
-      formatSource(x, 3, 6, tableSearchForm);
+      formatSource(x, 2, 6, tableSearchForm);
+      formatSource(x, 3, 7, tableSearchForm);
+      formatSource(x, 4, 5, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择店铺',
@@ -9633,13 +9656,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     name: 'qp-skuName-like',
     label: 'SKU名称'
   }, {
-    name: 'qp-skcCode-like',
-    label: 'SKC编码',
-    type: 'multipleQueryInput'
-  }, {
-    name: 'qp-itemCode-like',
-    label: 'SPU编码',
-    type: 'multipleQueryInput'
+    name: 'qp-externalCode-like',
+    label: '外部SPU编码'
   }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
     name: 'qp-code-in',
     label: '商品条码',
@@ -9702,7 +9720,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       'ctl-withAuth': true
     },
     resType: 'list',
-    resPosition: isNoUseItemBarcode ? 4 : 5,
+    resPosition: isNoUseItemBarcode ? 3 : 4,
     resKeyValue: ['id', 'name']
   }, {
     url: "/items/category/queryCategoryTree",
@@ -9711,7 +9729,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       currentPage: 1
     },
     resType: 'treeList',
-    resPosition: isNoUseItemBarcode ? 5 : 6
+    resPosition: isNoUseItemBarcode ? 4 : 5
   }];
   var mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
   var props = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "3.0.0-alpha.20",
+  "version": "3.0.0-alpha.21",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/AddSelectBusiness/index.tsx

@@ -353,8 +353,7 @@ export const AddSkuSelect = (parProps: any) => {
       name: 'qp-skuCode-like', label: 'SKU编码',type:'multipleQueryInput'
     },
     { name: 'qp-skuName-like', label: 'SKU名称' },
-    { name: 'qp-skcCode-like', label: 'SKC编码',type:'multipleQueryInput' },
-    { name: 'qp-itemCode-like', label: 'SPU编码',type:'multipleQueryInput' },
+    { name: 'qp-externalCode-like', label: '外部SPU编码' },
     ...(isNoUseItemBarcode ? []: [
       { name: 'qp-code-in', label: '商品条码', field: {
           type: 'multipleQueryInput',
@@ -407,7 +406,7 @@ export const AddSkuSelect = (parProps: any) => {
         'ctl-withAuth': true
       },
       resType: 'list',
-      resPosition: isNoUseItemBarcode ? 4 : 5,
+      resPosition: isNoUseItemBarcode ? 3 : 4,
       resKeyValue: ['id','name']
     },
     {
@@ -417,7 +416,7 @@ export const AddSkuSelect = (parProps: any) => {
         currentPage: 1,
       },
       resType: 'treeList',
-      resPosition: isNoUseItemBarcode ? 5 : 6
+      resPosition: isNoUseItemBarcode ? 4 : 5
     },
   ]
   const mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);

package/src/components/Business/SearchSelect/BusinessUtils.ts

@@ -1236,6 +1236,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
+      { name: 'qp-mainBrandCode-in', type: 'select', label: '品牌', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        } },
       { name: 'qp-accountingCode-in', type: 'select', label: '归属核算主体', field: {
           type: 'select',
           props: {
@@ -1271,11 +1285,16 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         pageSize: 5000,
         currentPage: 1,
       }),
+      loadSelectSource(`${prefixUrl.formSelectFix}/store`, {
+        pageSize: 5000,
+        currentPage: 1,
+      }),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm);
       formatSource(x,1, 3, tableSearchForm);
-      formatSource(x,2, 5, tableSearchForm);
-      formatSource(x,3, 6, tableSearchForm);
+      formatSource(x,2, 6, tableSearchForm);
+      formatSource(x,3, 7, tableSearchForm);
+      formatSource(x,4, 5, tableSearchForm);
     })
     modalTableProps = {
       modalTableTitle: '选择店铺',