@bit-sun/business-component 4.2.0-alpha.6.14 → 4.2.0-alpha.6.16

package/dist/index.esm.js

@@ -12363,6 +12363,24 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       },
       initialSource: getDictionarySource$1('BUSINESS_StoreType')
+    }, {
+      name: "qp-brandCode-in",
+      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;
+          }
+        }
+      }
     }];
     var _queryHeaderParams12 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -12378,7 +12396,11 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-type-in': '1,2'
     }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+      pageSize: 5000,
+      currentPage: 1,
+      'ctl-withAuth': true
+    }, getQueryHeadersItem(_queryHeaderParams12, 'ctl-withAuth'))]).then(function (x) {
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
@@ -12388,6 +12410,7 @@ function commonFun(type, prefixUrl, parentProps) {
       formatSource(x, 0, 3, tableSearchForm);
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+      formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -12730,7 +12753,7 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-email-like',
       label: '邮箱'
     }, {
-      name: 'qp-officeTelephone-like',
+      name: 'qp-phone-like',
       label: '手机号'
     }]);
     var _queryHeaderParams14 = getQueryHeadersList({
@@ -12790,7 +12813,7 @@ function commonFun(type, prefixUrl, parentProps) {
         dataIndex: 'email'
       }, {
         title: '手机号',
-        dataIndex: 'officeTelephone',
+        dataIndex: 'phone',
         defaultSort: 4,
         render: function render(text, record) {
           return handleTextOverflow(text || (record === null || record === void 0 ? void 0 : record.phone));

package/dist/index.js

@@ -12386,6 +12386,24 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       },
       initialSource: getDictionarySource$1('BUSINESS_StoreType')
+    }, {
+      name: "qp-brandCode-in",
+      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;
+          }
+        }
+      }
     }];
     var _queryHeaderParams12 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -12401,7 +12419,11 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-type-in': '1,2'
     }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+      pageSize: 5000,
+      currentPage: 1,
+      'ctl-withAuth': true
+    }, getQueryHeadersItem(_queryHeaderParams12, 'ctl-withAuth'))]).then(function (x) {
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
@@ -12411,6 +12433,7 @@ function commonFun(type, prefixUrl, parentProps) {
       formatSource(x, 0, 3, tableSearchForm);
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+      formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -12753,7 +12776,7 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-email-like',
       label: '邮箱'
     }, {
-      name: 'qp-officeTelephone-like',
+      name: 'qp-phone-like',
       label: '手机号'
     }]);
     var _queryHeaderParams14 = getQueryHeadersList({
@@ -12813,7 +12836,7 @@ function commonFun(type, prefixUrl, parentProps) {
         dataIndex: 'email'
       }, {
         title: '手机号',
-        dataIndex: 'officeTelephone',
+        dataIndex: 'phone',
         defaultSort: 4,
         render: function render(text, record) {
           return handleTextOverflow(text || (record === null || record === void 0 ? void 0 : record.phone));

package/package.json

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

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

@@ -2120,6 +2120,24 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       } ,
       initialSource: getDictionarySource('BUSINESS_StoreType')
     },
+      {
+        name: "qp-brandCode-in",
+        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,
+          },
+        },
+      },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2136,12 +2154,18 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       loadSelectSource(`${prefixUrl.formSelectFix}/tagNode/getTree/10`, {
         'qp-status-eq': 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
+        pageSize: 5000,
+        currentPage: 1,
+        'ctl-withAuth': true,
+      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
     ]).then((x: any)=>{
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
       formatSource(x,0, 3, tableSearchForm);
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
+      formatSource(x,3, 7, tableSearchForm, ['brandCode', 'name']);
     })
     modalTableProps = {
       modalTableTitle: '选择商店',
@@ -2497,7 +2521,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         } },
       ...(modalTableBusProps?.needTypeSearch?[{ name: 'qp-employmentType-eq', type: 'select', label: '员工类型', initialSource: employeeType  }]:[]),
       { name: 'qp-email-like', label: '邮箱' },
-      { name: 'qp-officeTelephone-like', label: '手机号' },
+      { name: 'qp-phone-like', label: '手机号' },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2550,7 +2574,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         },
         {
           title: '手机号',
-          dataIndex: 'officeTelephone',
+          dataIndex: 'phone',
           defaultSort: 4,
           render: (text: any, record: any) => handleTextOverflow(text||record?.phone),
         },