@bit-sun/business-component 4.2.0-alpha.30 → 4.2.0-alpha.31

package/dist/index.esm.js

@@ -11980,7 +11980,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-salesOrgCode-eq',
       type: 'select',
-      label: '使用组织',
+      label: '销售组织',
       field: {
         type: 'select',
         props: {
@@ -12040,54 +12040,33 @@ function commonFun(type, prefixUrl, parentProps) {
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
       }
-    }, {
-      name: 'qp-orgCode-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;
-          }
-        }
-      }
     }];
     var _queryHeaderParams0 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams0, 'qp-createOrgCode-eq')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams0, 'qp-createOrgCode-eq')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getTree/sales-organizational-view"), {
+      'qp-employeeCode-eq': getEmployeeCode(),
+      'qp-realOrg-eq': true,
+      'qp-status-eq': 10
+    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-salesOrgCode-eq')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
       'qp-status-eq': 10,
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-saleChannel-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getTree/sales-organizational-view"), {
-      'qp-employeeCode-eq': getEmployeeCode(),
-      'qp-realOrg-eq': true,
-      'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-orgCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-refCode-in'))]).then(function (x) {
       var firstElement = x === null || x === void 0 ? void 0 : x[0];
-      var allList = firstElement && [firstElement, firstElement];
-      formatSource(allList, 0, 2, tableSearchForm);
-      formatSource(allList, 1, 3, tableSearchForm);
+      formatSource(x, 0, 2, tableSearchForm);
+      formatSource(x, 1, 3, tableSearchForm);
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
       var areaDisabledJude = function areaDisabledJude(data) {
         return data['parent'] === '0';
       }; // 所属营销区域 树节点不能点判断
-      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
-      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
-      formatSource(x, 3, 6, tableSearchForm);
+      formatTreeDataSource(x, 2, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 3, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择客户',
@@ -12109,7 +12088,7 @@ function commonFun(type, prefixUrl, parentProps) {
         dataIndex: 'createOrgName',
         defaultSort: 3
       }, {
-        title: '使用组织',
+        title: '销售组织',
         dataIndex: 'salesOrgName',
         defaultSort: 4,
         width: 100

package/dist/index.js

@@ -12003,7 +12003,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-salesOrgCode-eq',
       type: 'select',
-      label: '使用组织',
+      label: '销售组织',
       field: {
         type: 'select',
         props: {
@@ -12063,54 +12063,33 @@ function commonFun(type, prefixUrl, parentProps) {
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
       }
-    }, {
-      name: 'qp-orgCode-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;
-          }
-        }
-      }
     }];
     var _queryHeaderParams0 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams0, 'qp-createOrgCode-eq')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams0, 'qp-createOrgCode-eq')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getTree/sales-organizational-view"), {
+      'qp-employeeCode-eq': getEmployeeCode(),
+      'qp-realOrg-eq': true,
+      'qp-status-eq': 10
+    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-salesOrgCode-eq')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
       'qp-status-eq': 10,
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-saleChannel-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getTree/sales-organizational-view"), {
-      'qp-employeeCode-eq': getEmployeeCode(),
-      'qp-realOrg-eq': true,
-      'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-orgCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-refCode-in'))]).then(function (x) {
       var firstElement = x === null || x === void 0 ? void 0 : x[0];
-      var allList = firstElement && [firstElement, firstElement];
-      formatSource(allList, 0, 2, tableSearchForm);
-      formatSource(allList, 1, 3, tableSearchForm);
+      formatSource(x, 0, 2, tableSearchForm);
+      formatSource(x, 1, 3, tableSearchForm);
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
       var areaDisabledJude = function areaDisabledJude(data) {
         return data['parent'] === '0';
       }; // 所属营销区域 树节点不能点判断
-      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
-      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
-      formatSource(x, 3, 6, tableSearchForm);
+      formatTreeDataSource(x, 2, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 3, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择客户',
@@ -12132,7 +12111,7 @@ function commonFun(type, prefixUrl, parentProps) {
         dataIndex: 'createOrgName',
         defaultSort: 3
       }, {
-        title: '使用组织',
+        title: '销售组织',
         dataIndex: 'salesOrgName',
         defaultSort: 4,
         width: 100

package/package.json

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

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

@@ -1790,7 +1790,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-      { name: 'qp-salesOrgCode-eq', type: 'select', label: '使用组织', field: {
+      { name: 'qp-salesOrgCode-eq', type: 'select', label: '销售组织', field: {
           type: 'select',
           props: {
             // mode: 'multiple',
@@ -1843,47 +1843,33 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         }
       },
-      { name: 'qp-orgCode-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,
-          },
-        } },
     ];
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
-      loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {},getQueryHeadersItem(queryHeaderParams,'qp-createOrgCode-eq')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {
+      },getQueryHeadersItem(queryHeaderParams,'qp-createOrgCode-eq')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getTree/sales-organizational-view`, {
+        'qp-employeeCode-eq': getEmployeeCode(),
+        'qp-realOrg-eq': true,
+        'qp-status-eq': 10
+      },getQueryHeadersItem(queryHeaderParams,'qp-salesOrgCode-eq')),
       loadSelectSource(`/channel-manage/channelInfo/tree`, {
         'qp-status-eq': 10,
         'qp-isMain-eq': 1,
         'qp-type-in': '1,2',
-      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      },getQueryHeadersItem(queryHeaderParams,'qp-saleChannel-in')),
       loadSelectSource(`/channel-manage/tagNode/getTree/10`, {
         'qp-status-eq': 1,
-      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
-      loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getTree/sales-organizational-view`, {
-        'qp-employeeCode-eq': getEmployeeCode(),
-        'qp-realOrg-eq': true,
-        'qp-status-eq': 10
-      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      },getQueryHeadersItem(queryHeaderParams,'qp-refCode-in')),
     ]).then((x: any)=>{
       const firstElement = x?.[0];
       const allList = firstElement && [firstElement, firstElement];
-      formatSource(allList,0, 2, tableSearchForm);
-      formatSource(allList,1, 3, tableSearchForm);
+      formatSource(x, 0, 2, tableSearchForm);
+      formatSource(x, 1, 3, tableSearchForm);
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
-      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
-      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
-      formatSource(x, 3, 6, tableSearchForm);
+      formatTreeDataSource(x, 2, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 3, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择客户',
@@ -1910,7 +1896,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 3,
         },
         {
-          title: '使用组织',
+          title: '销售组织',
           dataIndex: 'salesOrgName',
           defaultSort: 4,
           width: 100,