@bit-sun/business-component 4.2.1-alpha.13-aiwei → 4.2.1-alpha.15-aiwei

package/dist/index.esm.js

@@ -11368,11 +11368,15 @@ function commonFun(type, prefixUrl, parentProps) {
     });
     Promise.all([loadSelectSource$1("/channel-manage/channelInfo/tree", {
       'qp-status-eq': 10,
-      'qp-isMain-eq': 1,
+      // 'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).then(function (x) {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).then(function (x) {
       var _x$, _x$$data$, _x$$data$$channelInfo;
       debugger;
       // 战区限制一级数据
@@ -11610,8 +11614,7 @@ function commonFun(type, prefixUrl, parentProps) {
           },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
-      },
-      initialSource: getDictionarySource$1('BASIC_OPS_WH_TYPE')
+      }
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
@@ -11632,9 +11635,12 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-type-in': '1,2'
     }, {
       headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/stock/ownerWarehouse/operationWarehouseClassificationList", {}, {
+      headers: _objectSpread2({}, extralHeaders)
     })]).then(function (x) {
       var _x$2, _x$2$data$, _x$2$data$$channelInf;
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
+      formatSource(x, 2, 3, tableSearchForm, ['operationWarehouseClassification', 'operationWarehouseClassificationName']);
       var newData1 = [];
       (_x$2 = x[1]) === null || _x$2 === void 0 ? void 0 : (_x$2$data$ = _x$2.data[0]) === null || _x$2$data$ === void 0 ? void 0 : (_x$2$data$$channelInf = _x$2$data$.channelInfoSon) === null || _x$2$data$$channelInf === void 0 ? void 0 : _x$2$data$$channelInf.forEach(function (item) {
         newData1.push({

package/dist/index.js

@@ -11391,11 +11391,15 @@ function commonFun(type, prefixUrl, parentProps) {
     });
     Promise.all([loadSelectSource$1("/channel-manage/channelInfo/tree", {
       'qp-status-eq': 10,
-      'qp-isMain-eq': 1,
+      // 'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).then(function (x) {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).then(function (x) {
       var _x$, _x$$data$, _x$$data$$channelInfo;
       debugger;
       // 战区限制一级数据
@@ -11633,8 +11637,7 @@ function commonFun(type, prefixUrl, parentProps) {
           },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
-      },
-      initialSource: getDictionarySource$1('BASIC_OPS_WH_TYPE')
+      }
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
@@ -11655,9 +11658,12 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-type-in': '1,2'
     }, {
       headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/stock/ownerWarehouse/operationWarehouseClassificationList", {}, {
+      headers: _objectSpread2({}, extralHeaders)
     })]).then(function (x) {
       var _x$2, _x$2$data$, _x$2$data$$channelInf;
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
+      formatSource(x, 2, 3, tableSearchForm, ['operationWarehouseClassification', 'operationWarehouseClassificationName']);
       var newData1 = [];
       (_x$2 = x[1]) === null || _x$2 === void 0 ? void 0 : (_x$2$data$ = _x$2.data[0]) === null || _x$2$data$ === void 0 ? void 0 : (_x$2$data$$channelInf = _x$2$data$.channelInfoSon) === null || _x$2$data$$channelInf === void 0 ? void 0 : _x$2$data$$channelInf.forEach(function (item) {
         newData1.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.1-alpha.13-aiwei",
+  "version": "4.2.1-alpha.15-aiwei",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -1344,12 +1344,20 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     Promise.all([
       loadSelectSource(`/channel-manage/channelInfo/tree`, {
         'qp-status-eq': 10,
-        'qp-isMain-eq': 1,
+        // 'qp-isMain-eq': 1,
         'qp-type-in': '1,2',
-      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      }, {
+        headers: {
+          ...extralHeaders
+        }
+      }),
       loadSelectSource(`/channel-manage/tagNode/getTree/10`, {
         'qp-status-eq': 1,
-      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      },{
+        headers: {
+          ...extralHeaders
+        }
+      }),
     ]).then((x: any)=>{
       debugger
       // 战区限制一级数据
@@ -1556,7 +1564,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             showCheckedStrategy: 'TreeSelect.SHOW_ALL',
           },
         },
-         initialSource: getDictionarySource('BASIC_OPS_WH_TYPE')
       },
       ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[]),
     ]
@@ -1576,8 +1583,14 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           ...extralHeaders
         }
       }),
+      loadSelectSource(`/stock/ownerWarehouse/operationWarehouseClassificationList`, {}, {
+        headers: {
+          ...extralHeaders
+        }
+      }),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['groupCode','groupName']);
+      formatSource(x,2, 3, tableSearchForm,['operationWarehouseClassification','operationWarehouseClassificationName']);
       const newData1: any[] = [];
       x[1]?.data[0]?.channelInfoSon?.forEach((item: any) => {
         newData1.push({ code: item.code, name: item.name })