@bit-sun/business-component 1.1.39 → 1.2.0

package/.umirc.ts

@@ -24,5 +24,36 @@ export default defineConfig({
     'https://bitsun-website.oss-cn-shanghai.aliyuncs.com/cdn/dist/css/luckysheet.css',
     'https://bitsun-website.oss-cn-shanghai.aliyuncs.com/cdn/dist/assets/iconfont/iconfont.css',
   ],
+  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/', // 测试环境
+      changeOrigin: true,
+      pathRewrite: { '^/bop/api/': '/bop/' },
+    },
+    '/wms-ops/': {
+      // bop
+      target: 'http://bitsun.product.app.business-operation-platform.v1-dev:8050', // 开发环境
+      // 英伦
+      // target: 'http://47.100.87.54:9102/', // 开发环境
+      // target: 'http://test.i-baby.net/', // 测试环境
+      changeOrigin: true,
+      pathRewrite: { '^/bop/api/': '/bop/' },
+    },
+    '/user/api/': {
+      target: 'http://bitsun.product.app.user-manage.v1-dev:8312/um/', // 开发环境
+      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/',
+      changeOrigin: true,
+      pathRewrite: { '^/channel/api/': '/' }, // 开发环境
+    },
+  },
   // more config: https://d.umijs.org/config
 });

package/dist/index.esm.js

@@ -2579,6 +2579,7 @@ var SearchSelect = function SearchSelect(props) {
 
         if (fixedParamVal) {
           fixedParam[item] = fixedParamVal;
+          form.setFieldsValue(_objectSpread2(_objectSpread2({}, form === null || form === void 0 ? void 0 : form.getFieldsValue()), {}, _defineProperty({}, item, fixedParamVal)));
         }
       });
     } // 数组对象处理,对带有特殊标记的name进行处理
@@ -2758,13 +2759,13 @@ var SearchSelect = function SearchSelect(props) {
 
         ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(resultSourceKey, source);
         setItems(source);
-        setItemsTotal(Number(res === null || res === void 0 ? void 0 : res.total));
+        setItemsTotal(Number((res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : res.totalCount) || source.length));
       } else {
         setTableData(source);
         setTablePagination(_objectSpread2(_objectSpread2({}, tablePagination), {}, {
-          total: Number(res === null || res === void 0 ? void 0 : res.total),
-          pageSize: Number(res === null || res === void 0 ? void 0 : res.size),
-          current: Number(res === null || res === void 0 ? void 0 : res.page)
+          total: Number((res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : res.totalCount) || source.length),
+          pageSize: Number((res === null || res === void 0 ? void 0 : res.size) || (res === null || res === void 0 ? void 0 : res.pageSize) || (params === null || params === void 0 ? void 0 : params.pageSize) || pageSize),
+          current: Number((res === null || res === void 0 ? void 0 : res.page) || (res === null || res === void 0 ? void 0 : res.currentPage) || (params === null || params === void 0 ? void 0 : params.currentPage) || currentPage)
         }));
       }
     }).catch(function (err) {
@@ -3410,9 +3411,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;
+
       result = result.data;
 
-      if (result.status !== '0') {
+      if (result.status && result.status !== '0' || ((_result = result) === null || _result === void 0 ? void 0 : _result.code) && result.code !== '000000') {
         message.error(result.msg);
         return;
       }
@@ -3490,7 +3493,15 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     changeSearchForm[changePosition].field.props.treeData = formatData;
   };
 
-  var tableSearchForm = []; // 供应商选择器
+  var tableSearchForm = [];
+
+  var modalTableProps = _objectSpread2({
+    modalTableTitle: '',
+    tableSearchForm: tableSearchForm,
+    tableColumns: []
+  }, modalTableBusProps);
+
+  var needModalTable = true; // 供应商选择器
 
   if (type === 'supplier') {
     tableSearchForm = [{
@@ -3578,40 +3589,108 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       formatSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 4, tableSearchForm);
     });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择供应商',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '供应商编码',
+        dataIndex: 'code'
+      }, {
+        title: '供应商名称',
+        dataIndex: 'name'
+      }, {
+        title: '归属集团',
+        dataIndex: 'conglomerateName'
+      }, {
+        title: '归属法人公司',
+        dataIndex: 'legalCompanyName'
+      }, {
+        title: '归属核算主体',
+        dataIndex: 'accountingName'
+      }, {
+        title: '共享类型',
+        dataIndex: 'sharingType',
+        render: function render(text) {
+          var _sharingType$find;
+
+          return hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : (_sharingType$find = sharingType.find(function (i) {
+            return i.value === text;
+          })) === null || _sharingType$find === void 0 ? void 0 : _sharingType$find.text;
+        }
+      }]
+    }, modalTableBusProps);
   }
 
-  var modalTableProps = _objectSpread2({
-    modalTableTitle: '选择供应商',
-    tableSearchForm: tableSearchForm,
-    tableColumns: [{
-      title: '供应商编码',
-      dataIndex: 'code'
-    }, {
-      title: '供应商名称',
-      dataIndex: 'name'
-    }, {
-      title: '归属集团',
-      dataIndex: 'conglomerateName'
+  if (type === 'supplier2') {
+    // 版本2
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '供应商名称'
     }, {
-      title: '归属法人公司',
-      dataIndex: 'legalCompanyName'
+      name: 'qp-code-like',
+      label: '供应商编码'
     }, {
-      title: '归属核算主体',
-      dataIndex: 'accountingName'
+      name: 'qp-createOrgCode-eq',
+      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;
+          }
+        }
+      }
     }, {
-      title: '共享类型',
-      dataIndex: 'sharingType',
-      render: function render(text) {
-        var _sharingType$find;
-
-        return hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : (_sharingType$find = sharingType.find(function (i) {
-          return i.value === text;
-        })) === null || _sharingType$find === void 0 ? void 0 : _sharingType$find.text;
+      name: 'qp-supplierOrgCode-eq',
+      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;
+          }
+        }
       }
-    }]
-  }, modalTableBusProps);
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}), loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm);
+      formatSource(x, 1, 3, tableSearchForm);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择供应商',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '供应商编码',
+        dataIndex: 'code'
+      }, {
+        title: '供应商名称',
+        dataIndex: 'name'
+      }, {
+        title: '创建组织',
+        dataIndex: 'createOrgName'
+      }, {
+        title: '使用组织',
+        dataIndex: 'salesOrgName'
+      }]
+    }, modalTableBusProps);
+  } // 商品选择器sku
 
-  var needModalTable = true; // 商品选择器sku
 
   if (type === 'skuCommodity') {
     requestConfig = _objectSpread2({
@@ -3663,7 +3742,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
             mode: 'multiple',
             maxTagCount: 1
           }
-        }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.skuPropertyValueRequestConfig) || {})
+        }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.skuPropertyValueRequestConfig) || {
+          prefixUrl: prefixUrl
+        })
       }
     } : null, {
       name: 'qp-brandId-in',
@@ -4301,6 +4382,86 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }]
     }, modalTableBusProps);
+  }
+
+  if (type === 'customer2') {
+    // 版本2
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/customer"),
+      filter: 'qp-name,code-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'customCode'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '客户名称'
+    }, {
+      name: 'qp-code-like',
+      label: '客户编码'
+    }, {
+      name: 'qp-createOrgCode-eq',
+      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-salesOrgCode-eq',
+      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, "/org/listNoPage"), {}), loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm);
+      formatSource(x, 1, 3, tableSearchForm);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择客户',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '客户编码',
+        dataIndex: 'code'
+      }, {
+        title: '客户名称',
+        dataIndex: 'name'
+      }, {
+        title: '创建组织',
+        dataIndex: 'createOrgName'
+      }, {
+        title: '使用组织',
+        dataIndex: 'salesOrgName'
+      }]
+    }, modalTableBusProps);
   } // 店铺选择器
 
 
@@ -4580,6 +4741,77 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         dataIndex: 'officeTelephone'
       }]
     }, modalTableBusProps);
+  }
+
+  if (type === 'employee2') {
+    // 版本2
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/employee/pageList/v2"),
+      filter: 'qp-employeeNumber,name-orGroup,like',
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'employeeNumber',
+      mappingValueField: 'id',
+      otherParams: {
+        'qp-enable-eq': 10,
+        sorter: 'desc-id'
+      },
+      sourceName: 'employeeNumber'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '员工名称'
+    }, {
+      name: 'qp-employeeNumber-like',
+      label: '员工编码'
+    }, {
+      name: 'qp-directOrgCode-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-email-like',
+      label: '邮箱'
+    }, {
+      name: 'qp-officeTelephone-like',
+      label: '手机号'
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择员工',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '员工编码',
+        dataIndex: 'employeeNumber'
+      }, {
+        title: '员工名称',
+        dataIndex: 'name'
+      }, {
+        title: '所属组织机构',
+        dataIndex: 'directOrgName'
+      }, {
+        title: '邮箱',
+        dataIndex: 'email'
+      }, {
+        title: '手机号',
+        dataIndex: 'officeTelephone'
+      }]
+    }, modalTableBusProps);
   } // 配送方式选择器
 
 

package/dist/index.js

@@ -2590,6 +2590,7 @@ var SearchSelect = function SearchSelect(props) {
 
         if (fixedParamVal) {
           fixedParam[item] = fixedParamVal;
+          form.setFieldsValue(_objectSpread2(_objectSpread2({}, form === null || form === void 0 ? void 0 : form.getFieldsValue()), {}, _defineProperty({}, item, fixedParamVal)));
         }
       });
     } // 数组对象处理,对带有特殊标记的name进行处理
@@ -2769,13 +2770,13 @@ var SearchSelect = function SearchSelect(props) {
 
         ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(resultSourceKey, source);
         setItems(source);
-        setItemsTotal(Number(res === null || res === void 0 ? void 0 : res.total));
+        setItemsTotal(Number((res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : res.totalCount) || source.length));
       } else {
         setTableData(source);
         setTablePagination(_objectSpread2(_objectSpread2({}, tablePagination), {}, {
-          total: Number(res === null || res === void 0 ? void 0 : res.total),
-          pageSize: Number(res === null || res === void 0 ? void 0 : res.size),
-          current: Number(res === null || res === void 0 ? void 0 : res.page)
+          total: Number((res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : res.totalCount) || source.length),
+          pageSize: Number((res === null || res === void 0 ? void 0 : res.size) || (res === null || res === void 0 ? void 0 : res.pageSize) || (params === null || params === void 0 ? void 0 : params.pageSize) || pageSize),
+          current: Number((res === null || res === void 0 ? void 0 : res.page) || (res === null || res === void 0 ? void 0 : res.currentPage) || (params === null || params === void 0 ? void 0 : params.currentPage) || currentPage)
         }));
       }
     }).catch(function (err) {
@@ -3421,9 +3422,11 @@ var getDictionaryTextByValue = function getDictionaryTextByValue(dicCode, value)
 var loadSelectSource = function loadSelectSource(url, params) {
   return new Promise(function (resolve, reject) {
     axios__default['default'].get("".concat(url, "?").concat(querystring.stringify(params))).then(function (result) {
+      var _result;
+
       result = result.data;
 
-      if (result.status !== '0') {
+      if (result.status && result.status !== '0' || ((_result = result) === null || _result === void 0 ? void 0 : _result.code) && result.code !== '000000') {
         antd.message.error(result.msg);
         return;
       }
@@ -3501,7 +3504,15 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     changeSearchForm[changePosition].field.props.treeData = formatData;
   };
 
-  var tableSearchForm = []; // 供应商选择器
+  var tableSearchForm = [];
+
+  var modalTableProps = _objectSpread2({
+    modalTableTitle: '',
+    tableSearchForm: tableSearchForm,
+    tableColumns: []
+  }, modalTableBusProps);
+
+  var needModalTable = true; // 供应商选择器
 
   if (type === 'supplier') {
     tableSearchForm = [{
@@ -3589,40 +3600,108 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       formatSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 4, tableSearchForm);
     });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择供应商',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '供应商编码',
+        dataIndex: 'code'
+      }, {
+        title: '供应商名称',
+        dataIndex: 'name'
+      }, {
+        title: '归属集团',
+        dataIndex: 'conglomerateName'
+      }, {
+        title: '归属法人公司',
+        dataIndex: 'legalCompanyName'
+      }, {
+        title: '归属核算主体',
+        dataIndex: 'accountingName'
+      }, {
+        title: '共享类型',
+        dataIndex: 'sharingType',
+        render: function render(text) {
+          var _sharingType$find;
+
+          return hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : (_sharingType$find = sharingType.find(function (i) {
+            return i.value === text;
+          })) === null || _sharingType$find === void 0 ? void 0 : _sharingType$find.text;
+        }
+      }]
+    }, modalTableBusProps);
   }
 
-  var modalTableProps = _objectSpread2({
-    modalTableTitle: '选择供应商',
-    tableSearchForm: tableSearchForm,
-    tableColumns: [{
-      title: '供应商编码',
-      dataIndex: 'code'
-    }, {
-      title: '供应商名称',
-      dataIndex: 'name'
-    }, {
-      title: '归属集团',
-      dataIndex: 'conglomerateName'
+  if (type === 'supplier2') {
+    // 版本2
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '供应商名称'
     }, {
-      title: '归属法人公司',
-      dataIndex: 'legalCompanyName'
+      name: 'qp-code-like',
+      label: '供应商编码'
     }, {
-      title: '归属核算主体',
-      dataIndex: 'accountingName'
+      name: 'qp-createOrgCode-eq',
+      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;
+          }
+        }
+      }
     }, {
-      title: '共享类型',
-      dataIndex: 'sharingType',
-      render: function render(text) {
-        var _sharingType$find;
-
-        return hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : (_sharingType$find = sharingType.find(function (i) {
-          return i.value === text;
-        })) === null || _sharingType$find === void 0 ? void 0 : _sharingType$find.text;
+      name: 'qp-supplierOrgCode-eq',
+      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;
+          }
+        }
       }
-    }]
-  }, modalTableBusProps);
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}), loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm);
+      formatSource(x, 1, 3, tableSearchForm);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择供应商',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '供应商编码',
+        dataIndex: 'code'
+      }, {
+        title: '供应商名称',
+        dataIndex: 'name'
+      }, {
+        title: '创建组织',
+        dataIndex: 'createOrgName'
+      }, {
+        title: '使用组织',
+        dataIndex: 'salesOrgName'
+      }]
+    }, modalTableBusProps);
+  } // 商品选择器sku
 
-  var needModalTable = true; // 商品选择器sku
 
   if (type === 'skuCommodity') {
     requestConfig = _objectSpread2({
@@ -3674,7 +3753,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
             mode: 'multiple',
             maxTagCount: 1
           }
-        }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.skuPropertyValueRequestConfig) || {})
+        }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.skuPropertyValueRequestConfig) || {
+          prefixUrl: prefixUrl
+        })
       }
     } : null, {
       name: 'qp-brandId-in',
@@ -4312,6 +4393,86 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }]
     }, modalTableBusProps);
+  }
+
+  if (type === 'customer2') {
+    // 版本2
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/customer"),
+      filter: 'qp-name,code-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'customCode'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '客户名称'
+    }, {
+      name: 'qp-code-like',
+      label: '客户编码'
+    }, {
+      name: 'qp-createOrgCode-eq',
+      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-salesOrgCode-eq',
+      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, "/org/listNoPage"), {}), loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm);
+      formatSource(x, 1, 3, tableSearchForm);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择客户',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '客户编码',
+        dataIndex: 'code'
+      }, {
+        title: '客户名称',
+        dataIndex: 'name'
+      }, {
+        title: '创建组织',
+        dataIndex: 'createOrgName'
+      }, {
+        title: '使用组织',
+        dataIndex: 'salesOrgName'
+      }]
+    }, modalTableBusProps);
   } // 店铺选择器
 
 
@@ -4591,6 +4752,77 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         dataIndex: 'officeTelephone'
       }]
     }, modalTableBusProps);
+  }
+
+  if (type === 'employee2') {
+    // 版本2
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/employee/pageList/v2"),
+      filter: 'qp-employeeNumber,name-orGroup,like',
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'employeeNumber',
+      mappingValueField: 'id',
+      otherParams: {
+        'qp-enable-eq': 10,
+        sorter: 'desc-id'
+      },
+      sourceName: 'employeeNumber'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '员工名称'
+    }, {
+      name: 'qp-employeeNumber-like',
+      label: '员工编码'
+    }, {
+      name: 'qp-directOrgCode-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-email-like',
+      label: '邮箱'
+    }, {
+      name: 'qp-officeTelephone-like',
+      label: '手机号'
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择员工',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '员工编码',
+        dataIndex: 'employeeNumber'
+      }, {
+        title: '员工名称',
+        dataIndex: 'name'
+      }, {
+        title: '所属组织机构',
+        dataIndex: 'directOrgName'
+      }, {
+        title: '邮箱',
+        dataIndex: 'email'
+      }, {
+        title: '手机号',
+        dataIndex: 'officeTelephone'
+      }]
+    }, modalTableBusProps);
   } // 配送方式选择器
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "1.1.39",
+  "version": "1.2.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -57,6 +57,14 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
 
   let tableSearchForm: any [] = [];
+  let modalTableProps = {
+    modalTableTitle: '',
+    tableSearchForm,
+    tableColumns: [],
+    ...modalTableBusProps,
+  }
+  let needModalTable = true;
+
   // 供应商选择器
   if(type === 'supplier') {
     tableSearchForm = [
@@ -126,40 +134,104 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       formatSource(x,1, 3, tableSearchForm);
       formatSource(x,2, 4, tableSearchForm);
     })
+    modalTableProps = {
+      modalTableTitle: '选择供应商',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '供应商编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '供应商名称',
+          dataIndex: 'name',
+        },
+        {
+          title: '归属集团',
+          dataIndex: 'conglomerateName',
+        },
+        {
+          title: '归属法人公司',
+          dataIndex: 'legalCompanyName',
+        },
+        {
+          title: '归属核算主体',
+          dataIndex: 'accountingName',
+        },
+        {
+          title: '共享类型',
+          dataIndex: 'sharingType',
+          render: (text: number) => hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : sharingType.find((i: any) => i.value === text)?.text
+        },
+      ],
+      ...modalTableBusProps,
+    }
   }
-  let modalTableProps = {
-    modalTableTitle: '选择供应商',
-    tableSearchForm,
-    tableColumns: [
-      {
-        title: '供应商编码',
-        dataIndex: 'code',
-      },
-      {
-        title: '供应商名称',
-        dataIndex: 'name',
-      },
-      {
-        title: '归属集团',
-        dataIndex: 'conglomerateName',
-      },
-      {
-        title: '归属法人公司',
-        dataIndex: 'legalCompanyName',
-      },
-      {
-        title: '归属核算主体',
-        dataIndex: 'accountingName',
-      },
-      {
-        title: '共享类型',
-        dataIndex: 'sharingType',
-        render: (text: number) => hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : sharingType.find((i: any) => i.value === text)?.text
-      },
-    ],
-    ...modalTableBusProps,
+  if(type === 'supplier2') {
+    // 版本2
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '供应商名称' }, // field: { type: 'input', props: { placeholder: '请输入'}}
+      { name: 'qp-code-like', label: '供应商编码' },
+      { name: 'qp-createOrgCode-eq', 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-supplierOrgCode-eq', 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,
+          },
+        } },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {}),
+      loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {}),
+    ]).then((x: any)=>{
+      formatSource(x,0, 2, tableSearchForm);
+      formatSource(x,1, 3, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择供应商',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '供应商编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '供应商名称',
+          dataIndex: 'name',
+        },
+        {
+          title: '创建组织',
+          dataIndex: 'createOrgName',
+        },
+        {
+          title: '使用组织',
+          dataIndex: 'salesOrgName',
+        },
+      ],
+      ...modalTableBusProps
+    }
   }
-  let needModalTable = true;
 
   // 商品选择器sku
   if(type === 'skuCommodity') {
@@ -192,7 +264,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
               mode: 'multiple',
               maxTagCount: 1,
             },
-            ...(requestConfigProp?.skuPropertyValueRequestConfig || {}),
+            ...(requestConfigProp?.skuPropertyValueRequestConfig || { prefixUrl }), // 可自定义此处规格请求接口相关参数，默认前缀取自sku选择器
           },
         }
       } : null,
@@ -783,6 +855,82 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       ...modalTableBusProps
     }
   }
+  if(type === 'customer2') {
+    // 版本2
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/customer`,
+      filter: 'qp-name,code-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'customCode',
+      ...requestConfigProp,
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '客户名称' },
+      { name: 'qp-code-like', label: '客户编码' },
+      { name: 'qp-createOrgCode-eq', 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-salesOrgCode-eq', 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,
+          },
+        } },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {}),
+      loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`,{}),
+    ]).then((x: any)=>{
+      formatSource(x,0, 2, tableSearchForm);
+      formatSource(x,1, 3, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择客户',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '客户编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '客户名称',
+          dataIndex: 'name',
+        },
+        {
+          title: '创建组织',
+          dataIndex: 'createOrgName',
+        },
+        {
+          title: '使用组织',
+          dataIndex: 'salesOrgName',
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
 
   // 店铺选择器
   if(type === 'shopFile') {
@@ -1043,6 +1191,74 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       ...modalTableBusProps
     }
   }
+  if(type === 'employee2') {
+    // 版本2
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/employee/pageList/v2`,
+      filter: 'qp-employeeNumber,name-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'employeeNumber',
+      mappingValueField: 'id',
+      otherParams: {
+        'qp-enable-eq': 10, // 启用状态 10-启用，20-禁用
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'employeeNumber',
+      ...requestConfigProp,
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '员工名称' },
+      { name: 'qp-employeeNumber-like', label: '员工编码' },
+      { name: 'qp-directOrgCode-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-email-like', label: '邮箱' },
+      { name: 'qp-officeTelephone-like', label: '手机号' },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {}),
+    ]).then((x: any)=>{
+      formatSource(x,0, 2, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择员工',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '员工编码',
+          dataIndex: 'employeeNumber',
+        },
+        {
+          title: '员工名称',
+          dataIndex: 'name',
+        },
+        {
+          title: '所属组织机构',
+          dataIndex: 'directOrgName',
+        },
+        {
+          title: '邮箱',
+          dataIndex: 'email',
+        },
+        {
+          title: '手机号',
+          dataIndex: 'officeTelephone',
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
 
   // 配送方式选择器
   if(type === 'deliveryMode') {

package/src/components/Business/SearchSelect/index.md

@@ -56,6 +56,11 @@ export default () => {
     selectBusinessType: 'supplier',
   };
   
+  const props2 = {
+    prefixUrl: { selectPrefix: '/channel/api', formSelectFix: '/channel/api' },
+    selectBusinessType: 'supplier2',
+  }
+  
   const onTabChange = (key) => {
     setTabKey(key)
     setValue(key === 'single' ? null: [])
@@ -66,12 +71,22 @@ export default () => {
       <Tabs onChange={onTabChange} activeKey={tabKey}>
         <TabPane tab='单选' key='single'>
           {tabKey === 'single' && (
-            <BusinessSearchSelect {...props} />
+            <>
+              <span>版本1:支持英伦项目...</span>
+              <BusinessSearchSelect {...props} />
+              <span>版本2:支持麦克英孚项目...</span>
+              <BusinessSearchSelect {...props2} />
+            </>
           )}
         </TabPane>
         <TabPane tab='多选' key='multiple'>
           {tabKey === 'multiple' && (
-            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+            <>
+              <span>版本1:支持英伦项目...</span>
+              <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+              <span>版本2:支持麦克英孚项目...</span>
+              <BusinessSearchSelect {...props2} selectProps={selectPropsMultiple} />
+            </>
           )}
         </TabPane>
       </Tabs>
@@ -619,6 +634,11 @@ export default () => {
     selectBusinessType: 'customer',
   };
 
+  const props2 = {
+    prefixUrl: { selectPrefix: '/channel/api', formSelectFix: '/channel/api' },
+    selectBusinessType: 'customer2',
+  }
+
   const onTabChange = (key) => {
     setTabKey(key)
     setValue(key === 'single' ? null: [])
@@ -629,12 +649,22 @@ export default () => {
       <Tabs onChange={onTabChange} activeKey={tabKey}>
         <TabPane tab='单选' key='single'>
           {tabKey === 'single' && (
-            <BusinessSearchSelect {...props} />
+            <>
+              <span>版本1:支持英伦项目...</span>
+              <BusinessSearchSelect {...props} />
+              <span>版本2:支持麦克英孚项目...</span>
+              <BusinessSearchSelect {...props2} />
+            </>
           )}
         </TabPane>
         <TabPane tab='多选' key='multiple'>
           {tabKey === 'multiple' && (
-            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+            <>
+              <span>版本1:支持英伦项目...</span>
+              <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+              <span>版本2:支持麦克英孚项目...</span>
+              <BusinessSearchSelect {...props2} selectProps={selectPropsMultiple} />
+            </>
           )}
         </TabPane>
       </Tabs>
@@ -964,6 +994,12 @@ export default () => {
     selectProps,
     selectBusinessType: 'employee',
   };
+  
+  const props2 = {
+    ...props,
+    prefixUrl: { selectPrefix: '/user/api', formSelectFix: '/user/api' },
+    selectBusinessType: 'employee2',
+  }
 
   const onTabChange = (key) => {
     setTabKey(key)
@@ -975,12 +1011,22 @@ export default () => {
       <Tabs onChange={onTabChange} activeKey={tabKey}>
         <TabPane tab='单选' key='single'>
           {tabKey === 'single' && (
-            <BusinessSearchSelect {...props} />
+            <>
+              <span>版本1:支持英伦项目...</span>
+              <BusinessSearchSelect {...props} />
+              <span>版本2:支持麦克英孚项目...</span>
+              <BusinessSearchSelect {...props2} />
+            </>
           )}
         </TabPane>
         <TabPane tab='多选' key='multiple'>
           {tabKey === 'multiple' && (
-            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+            <>
+              <span>版本1:支持英伦项目...</span>
+              <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+              <span>版本2:支持麦克英孚项目...</span>
+              <BusinessSearchSelect {...props2} selectProps={selectPropsMultiple} />
+            </>
           )}
         </TabPane>
       </Tabs>

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

@@ -59,7 +59,7 @@ const loadSelectSource = (url: string, params?: any) => {
       .get(`${url}?${stringify(params)}`)
       .then((result: any) => {
         result = result.data;
-        if (result.status !== '0') {
+        if ((result.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
           message.error(result.msg);
           return;
         }

package/src/components/Functional/SearchSelect/index.tsx

@@ -96,6 +96,7 @@ const SearchSelect = (props: any) => {
         const fixedParamVal = ctx.form.getFieldValue(fieldValToParam[index]);
         if (fixedParamVal) {
           fixedParam[item] = fixedParamVal;
+          form.setFieldsValue({ ...form?.getFieldsValue(), [item]: fixedParamVal })
         }
       });
     }
@@ -268,10 +269,10 @@ const SearchSelect = (props: any) => {
         if(type === 1) {
           ctx?.form?.setFieldSource(resultSourceKey, source)
           setItems(source)
-          setItemsTotal(Number(res?.total))
+          setItemsTotal(Number(res?.total || res?.totalCount || source.length))
         } else {
           setTableData(source)
-          setTablePagination({...tablePagination, total: Number(res?.total), pageSize: Number(res?.size), current: Number(res?.page)})
+          setTablePagination({...tablePagination, total: Number(res?.total || res?.totalCount || source.length), pageSize: Number(res?.size || res?.pageSize || (params?.pageSize || pageSize)), current: Number(res?.page || res?.currentPage || (params?.currentPage || currentPage))})
         }
       })
       .catch((err) => { setFetching(false) });