@bit-sun/business-component 1.2.3 → 2.0.0

package/.umirc.ts

@@ -26,33 +26,48 @@ export default defineConfig({
   ],
   proxy: {
     '/bop/api/': {
-      // bop
-      target: 'http://bitsun.product.app.business-operation-platform.v1-dev:8050', // 开发环境
-      // 英伦
-      // target: 'http://47.100.87.54:9106/', // 开发环境
-      // target: 'http://test.i-baby.net/', // 测试环境
+      // target: 'http://bitsun.product.app.business-operation-platform.v1-dev:8050', // 开发环境
+      target: 'https://test.i-baby.net/', // 测试环境
+      // target: 'http://yxzttest.yangzijiang.com/', // 扬子江测试环境
+      // target: 'http://yxzt.yangzijiang.com/', // 扬子江测试环境
       changeOrigin: true,
-      pathRewrite: { '^/bop/api/': '/bop/' },
+      // pathRewrite: { '^/bop/api/': '/bop/' }, // 开发环境
     },
     '/wms-ops/': {
+      // target: 'http://yxzttest.yangzijiang.com/', // 测试环境
+      // target: 'http://yxzt.yangzijiang.com/', // 测试环境
       // bop
-      target: 'http://bitsun.product.app.business-operation-platform.v1-dev:8050', // 开发环境
+      // target: 'http://bitsun.product.app.business-operation-platform.v1-dev:8050', // 开发环境
       // 英伦
       // target: 'http://47.100.87.54:9102/', // 开发环境
-      // target: 'http://test.i-baby.net/', // 测试环境
+      target: 'http://test.i-baby.net/', // 测试环境
+      // target: 'http://www.i-baby.net/', // 生产
+      changeOrigin: true,
+      // pathRewrite: { '^/wms-ops/': '/wms-ops/' }, // 开发环境
+    },
+    '/user/': {
+      target: 'http://omni.bitsun-inc.com/', // 开发环境
+      changeOrigin: true,
+    },
+    '/channel-manage/': {
+      target: 'http://omni.bitsun-inc.com/', // 开发环境
+      changeOrigin: true,
+    },
+    '/items/': {
+      target: 'http://omni.bitsun-inc.com/', // 开发环境
+      changeOrigin: true,
+    },
+    '/stock/': {
+      target: 'http://omni.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
-      pathRewrite: { '^/bop/api/': '/bop/' },
     },
-    '/user/api/': {
-      target: 'http://bitsun.product.app.user-manage.v1-dev:8312/um/', // 开发环境
+    '/basic/': {
+      target: 'http://omni.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
-      pathRewrite: { '^/user/api/': '/' }, // 开发环境
     },
-    '/channel/api/': {
-      target: 'http://bitsun.product.app.channel-manage.v1-dev:8301/channel-manage/', // 开发环境
-      // target: 'http://172.16.0.26:8033/channel-manage/',
+    '/srm-ops/': {
+      target: 'http://omni.bitsun-inc.com/', // 开发环境
       changeOrigin: true,
-      pathRewrite: { '^/channel/api/': '/' }, // 开发环境
     },
   },
   // more config: https://d.umijs.org/config

package/dist/components/Business/SearchSelect/BusinessUtils.d.ts

@@ -1,5 +1,5 @@
 export declare function commonFun(type?: string, prefixUrl: any, requestConfigProp?: any, modalTableBusProps?: any): {
     modalTableProps: any;
     requestConfig: any;
-    needModalTable: boolean;
+    needModalTable: any;
 };

package/dist/components/Business/SearchSelect/common.d.ts

@@ -2,6 +2,10 @@ declare const shopFileType: {
     text: string;
     value: string;
 }[];
+declare const shopFile2Type: {
+    text: string;
+    value: string;
+}[];
 declare const arrivalPaySupportList: {
     text: string;
     value: number;
@@ -10,4 +14,4 @@ declare const sharingType: {
     text: string;
     value: string;
 }[];
-export { shopFileType, arrivalPaySupportList, sharingType };
+export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type };

package/dist/components/Business/SearchSelect/utils.d.ts

@@ -1,4 +1,5 @@
 declare const getDictionarySource: (dicCode: string, needConvertInterger?: boolean) => {};
 declare const getDictionaryTextByValue: (dicCode: string, value: string | number) => any;
 declare const loadSelectSource: (url: string, params?: any) => Promise<unknown>;
-export { getDictionarySource, getDictionaryTextByValue, loadSelectSource };
+declare const handleDefaultPrefixUrl: (type: string) => string;
+export { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleDefaultPrefixUrl };

package/dist/index.esm.js

@@ -3072,6 +3072,7 @@ var SearchSelect = function SearchSelect(props) {
 
   var currentPage = 1;
   var selectParamsKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filter) || 'qp-codeAndName-like';
+  var selectParamsInitKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filterInit) || selectParamsKey;
 
   var currentSelectProps = _objectSpread2(_objectSpread2({}, selectProps), {}, {
     // 以下属性不可更改----设计配置项
@@ -3128,7 +3129,7 @@ var SearchSelect = function SearchSelect(props) {
     var searchParams = {};
 
     if (typeof selectParamsKey === 'string') {
-      searchParams = _defineProperty({}, selectParamsKey, v ? initVal : searchValue);
+      searchParams = v ? _defineProperty({}, selectParamsInitKey, initVal) : _defineProperty({}, selectParamsKey, searchValue);
     }
 
     if (Array.isArray(selectParamsKey)) {
@@ -3323,10 +3324,12 @@ var SearchSelect = function SearchSelect(props) {
     }, otherParams), fixedParam), params);
 
     axios.get("".concat(url, "?").concat(stringify(queryParams))).then(function (result) {
+      var _result, _result2;
+
       setFetching(false);
       result = result.data;
 
-      if (result.status !== '0') {
+      if (((_result = result) === null || _result === void 0 ? void 0 : _result.status) && result.status !== '0' || ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.code) && result.code !== '000000') {
         message.error(result.msg);
         return;
       }
@@ -3448,7 +3451,6 @@ var SearchSelect = function SearchSelect(props) {
   useEffect(function () {
     if (value) {
       setPopValue(value);
-      onChange(value);
     }
   }, [value]);
   useEffect(function () {
@@ -3517,9 +3519,9 @@ var SearchSelect = function SearchSelect(props) {
     if (labelInValue) {
       var formatResult = value.map(function (i) {
         return {
-          key: i.code,
-          label: i.name,
-          value: i.code
+          key: i[mappingValueField],
+          label: i[mappingTextField],
+          value: i[mappingValueField]
         };
       });
       onChange(selectMode ? formatResult : formatResult[0]);
@@ -3698,6 +3700,11 @@ var SearchSelect = function SearchSelect(props) {
     selectedRowKeys: selectedRowKeys,
     onChange: function onChange(sks, srs) {
       onChangeSelectedKeys(sks, srs);
+    },
+    getCheckboxProps: function getCheckboxProps() {
+      return {
+        disabled: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
+      };
     }
   };
 
@@ -3718,7 +3725,7 @@ var SearchSelect = function SearchSelect(props) {
   var formItem = function formItem(list) {
     if (isModalVisible && (list === null || list === void 0 ? void 0 : list.length)) {
       return list.map(function (i) {
-        var _i$field, _i$field3, _i$field5;
+        var _i$field, _i$field3, _i$field5, _i$field6, _i$field7;
 
         if ((i === null || i === void 0 ? void 0 : i.type) === 'select' || (i === null || i === void 0 ? void 0 : (_i$field = i.field) === null || _i$field === void 0 ? void 0 : _i$field.type) === 'select') {
           var _i$field2, _i$initialSource;
@@ -3755,12 +3762,24 @@ var SearchSelect = function SearchSelect(props) {
           }, i === null || i === void 0 ? void 0 : (_i$field4 = i.field) === null || _i$field4 === void 0 ? void 0 : _i$field4.props)));
         }
 
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'businessSearchSelect') {
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'businessSearchSelect' || (i === null || i === void 0 ? void 0 : (_i$field5 = i.field) === null || _i$field5 === void 0 ? void 0 : _i$field5.type) === 'businessSearchSelect') {
           return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form.Item, {
             name: i.name,
             label: i.label,
             key: i.name
           }, /*#__PURE__*/React.createElement(BusinessSearchSelect$1, _objectSpread2({}, i.field.props))));
+        }
+
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'multipleQueryInput' || (i === null || i === void 0 ? void 0 : (_i$field6 = i.field) === null || _i$field6 === void 0 ? void 0 : _i$field6.type) === 'multipleQueryInput') {
+          return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form.Item, {
+            name: i.name,
+            label: i.label,
+            key: i.name
+          }, /*#__PURE__*/React.createElement(QueryMutipleInput, {
+            onValueChange: function onValueChange(value) {
+              form.setFieldsValue(_defineProperty({}, i.name, value));
+            }
+          })));
         } // 默认type是input
 
 
@@ -3775,7 +3794,7 @@ var SearchSelect = function SearchSelect(props) {
           placeholder: "\u8BF7\u8F93\u5165",
           allowClear: true,
           maxLength: 100
-        }, i === null || i === void 0 ? void 0 : (_i$field5 = i.field) === null || _i$field5 === void 0 ? void 0 : _i$field5.props)));
+        }, i === null || i === void 0 ? void 0 : (_i$field7 = i.field) === null || _i$field7 === void 0 ? void 0 : _i$field7.props)));
       });
     } else {
       return null;
@@ -3970,7 +3989,8 @@ var SearchSelect = function SearchSelect(props) {
   }, /*#__PURE__*/React.createElement(Checkbox, {
     indeterminate: indeterminate,
     checked: checkedAll,
-    onChange: onChangeCheckAll
+    onChange: onChangeCheckAll,
+    disabled: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
   }), " \u5168\u9009\u6240\u6709\u9875\u9762") : '')))));
 };
 
@@ -3981,6 +4001,19 @@ var shopFileType = [{
   text: "线下",
   value: 'offline'
 }];
+var shopFile2Type = [{
+  text: "第三方线上",
+  value: 'online'
+}, {
+  text: "线下",
+  value: 'offline'
+}, {
+  text: "自营B2B",
+  value: 'B2B'
+}, {
+  text: "自营B2C",
+  value: 'B2C'
+}];
 var arrivalPaySupportList = [{
   text: "支持",
   value: 1
@@ -4047,11 +4080,11 @@ var getDictionaryTextByValue = function getDictionaryTextByValue(dicCode, value)
 var loadSelectSource = function loadSelectSource(url, params) {
   return new Promise(function (resolve, reject) {
     axios.get("".concat(url, "?").concat(stringify(params))).then(function (result) {
-      var _result;
+      var _result, _result2;
 
       result = result.data;
 
-      if (result.status && result.status !== '0' || ((_result = result) === null || _result === void 0 ? void 0 : _result.code) && result.code !== '000000') {
+      if (((_result = result) === null || _result === void 0 ? void 0 : _result.status) && result.status !== '0' || ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.code) && result.code !== '000000') {
         message.error(result.msg);
         return;
       }
@@ -4063,6 +4096,48 @@ var loadSelectSource = function loadSelectSource(url, params) {
   });
 };
 
+var handleDefaultPrefixUrl = function handleDefaultPrefixUrl(type) {
+  var result;
+
+  switch (type) {
+    case 'supplier2':
+    case 'customer2':
+    case 'shopFile2':
+      result = '/channel-manage';
+      break;
+
+    case 'skuCommodity':
+    case 'skuPropertyValue':
+    case 'spuCommodity':
+      result = '/items';
+      break;
+
+    case 'physicalWarehouse':
+    case 'realWarehouse':
+    case 'virtualWarehouse':
+    case 'channelWarehouse':
+      result = '/stock';
+      break;
+
+    case 'inventoryOrg2':
+    case 'purchaseOrg':
+    case 'salesOrg':
+    case 'employee2':
+      result = '/user';
+      break;
+
+    case 'deliveryMode':
+      result = '/basic';
+      break;
+
+    default:
+      result = '/bop/api';
+      break;
+  }
+
+  return result;
+};
+
 var _getDictionarySource;
 var hasDictSharingType = (_getDictionarySource = getDictionarySource('UC000013')) === null || _getDictionarySource === void 0 ? void 0 : _getDictionarySource.length;
 var sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType;
@@ -4090,7 +4165,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
 
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['code', 'name'];
     var data = reData && ((_reData$position = reData[position]) === null || _reData$position === void 0 ? void 0 : _reData$position.data);
-    var list = Array.isArray(data) ? data : (data === null || data === void 0 ? void 0 : data.items) || (data === null || data === void 0 ? void 0 : data.list) || [];
+    var list = Array.isArray(data) ? data : (data === null || data === void 0 ? void 0 : data.items) || (data === null || data === void 0 ? void 0 : data.list) || (data === null || data === void 0 ? void 0 : data.children) || [];
     var formatData = (list === null || list === void 0 ? void 0 : list.length) ? list.map(function (v) {
       return {
         text: v[resKeyValue[1]],
@@ -4137,7 +4212,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     tableColumns: []
   }, modalTableBusProps);
 
-  var needModalTable = true; // 供应商选择器
+  var needModalTable = (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needModalTable) !== undefined ? modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needModalTable : true; // 供应商选择器
 
   if (type === 'supplier') {
     tableSearchForm = [{
@@ -4337,7 +4412,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextShowTextField: ['name', 'propertyNameAndValue'],
       otherParams: {
         'qp-approveStatus-eq': 1,
-        'qp-type-eq': 10,
+        // 'qp-type-eq': 10, // 查唯一国际条码【有些项目不需要必须要有国际条码，故注释，需要的项目自己定义otherParams补充上这个条件】
         sorter: 'desc-id'
       },
       sourceName: 'skuCode'
@@ -4349,8 +4424,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       name: 'qp-name-like',
       label: 'SKU名称'
     }, {
-      name: 'qp-skuCode-like',
-      label: 'SKU编码'
+      name: 'qp-skuCode-in',
+      label: 'SKU编码',
+      field: {
+        type: 'multipleQueryInput',
+        props: _objectSpread2({}, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.skuCodeValueRequestConfig) || {})
+      }
     }, requestConfig.url.includes('v2') ? {
       name: 'qp-code-like',
       label: '国际条码'
@@ -4450,8 +4529,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       name: 'qp-name-like',
       label: 'SKU名称'
     }, {
-      name: 'qp-skuCode-like',
-      label: 'SKU编码'
+      name: 'qp-skuCode-in',
+      label: 'SKU编码',
+      field: {
+        type: 'multipleQueryInput',
+        props: _objectSpread2({}, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.skuCodeValueRequestConfig) || {})
+      }
     }, {
       name: 'qp-barCode-like',
       label: '国际条码'
@@ -4899,6 +4982,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'name',
       mappingValueField: 'code',
       otherParams: {
+        'qp-status-eq': 10,
         sorter: 'desc-id'
       },
       sourceName: 'customCode'
@@ -5254,6 +5338,83 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         dataIndex: 'accountingName'
       }]
     }, modalTableBusProps);
+  }
+
+  if (type === 'shopFile2') {
+    var _JSON$parse, _JSON$parse$employeeR;
+
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/store/page"),
+      filter: 'qp-name,code-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'code'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '商店名称'
+    }, {
+      name: 'qp-code-like',
+      label: '商店编码'
+    }, {
+      name: 'qp-type-in',
+      type: 'select',
+      label: '商店类型',
+      initialSource: shopFile2Type
+    }, {
+      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;
+          }
+        }
+      }
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/orgView/getTree/sales-organizational-view"), {
+      'qp-employeeCode-eq': (_JSON$parse = JSON.parse(localStorage.getItem('userInfo') || '{}')) === null || _JSON$parse === void 0 ? void 0 : (_JSON$parse$employeeR = _JSON$parse.employeeResVo) === null || _JSON$parse$employeeR === void 0 ? void 0 : _JSON$parse$employeeR.employeeNumber,
+      'qp-realOrg-eq': true,
+      'qp-status-eq': 10
+    })]).then(function (x) {
+      formatSource(x, 0, 3, tableSearchForm);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择商店',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '商店编码',
+        dataIndex: 'code'
+      }, {
+        title: '商店名称',
+        dataIndex: 'name'
+      }, {
+        title: '商店类型',
+        dataIndex: 'type',
+        render: function render(text) {
+          var _shopFile2Type$find;
+
+          return (_shopFile2Type$find = shopFile2Type.find(function (i) {
+            return i.value === text;
+          })) === null || _shopFile2Type$find === void 0 ? void 0 : _shopFile2Type$find.text;
+        }
+      }, {
+        title: '所属销售组织',
+        dataIndex: 'orgName'
+      }]
+    }, modalTableBusProps);
   } // 核算主体选择器（无弹窗）
 
 
@@ -5581,8 +5742,8 @@ var MemoSearchSelect = /*#__PURE__*/React.memo(SearchSelect);
 var BusinessSearchSelect = function BusinessSearchSelect(props) {
   var businessType = (props === null || props === void 0 ? void 0 : props.selectBusinessType) || 'supplier';
   var prefixUrl = (props === null || props === void 0 ? void 0 : props.prefixUrl) || {
-    selectPrefix: '/bop/api',
-    formSelectFix: '/bop/api'
+    selectPrefix: handleDefaultPrefixUrl(businessType),
+    formSelectFix: handleDefaultPrefixUrl(businessType)
   };
 
   var _commonFun = commonFun(businessType, prefixUrl, (props === null || props === void 0 ? void 0 : props.requestConfig) || {}, (props === null || props === void 0 ? void 0 : props.modalTableProps) || {}),
@@ -5756,5 +5917,6 @@ function getStorageVale(storageKeyString) {
 
 var resposne = JSON.parse(localStorage.getItem('userInfo') || '{}');
 axios.defaults.headers.common['sso-sessionid'] = (resposne === null || resposne === void 0 ? void 0 : resposne.sessionId) || '';
+axios.defaults.headers.common['x-tenant-id'] = (resposne === null || resposne === void 0 ? void 0 : resposne.tenantId) || '1';
 
 export { BusinessSearchSelect$1 as BusinessSearchSelect, index as CheckOneUser, CommodityEntry, DataImport, DataValidation, QueryMutipleInput, SearchSelect };