@bit-sun/business-component 2.3.15 → 2.3.17

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

@@ -18,4 +18,8 @@ declare const sharingType: {
     text: string;
     value: string;
 }[];
-export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status };
+declare const employeeType: {
+    text: string;
+    value: string;
+}[];
+export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status, employeeType };

package/dist/index.esm.js

@@ -6616,6 +6616,13 @@ var sharingType = [{
   text: "私有",
   value: '20'
 }];
+var employeeType = [{
+  text: "外部员工",
+  value: '10'
+}, {
+  text: "内部员工",
+  value: '20'
+}];
 
 var getDicData = function getDicData(dicCode) {
   var dicData = {};
@@ -8369,12 +8376,14 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'name',
       mappingTextShowKeyField: 'username',
       mappingValueField: 'id',
-      otherParams: {
+      otherParams: _objectSpread2(_objectSpread2({
         'qp-enable-eq': 10,
-        'qp-employmentType-eq': 20,
-        'qp-orgViewIds-like': 'administrative-organization-view',
+        'qp-orgViewIds-like': 'administrative-organization-view'
+      }, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needTypeSearch) ? {} : {
+        'qp-employmentType-eq': 20
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'employeeNumber'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -8413,13 +8422,18 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
-    }, {
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needTypeSearch) ? [{
+      name: 'qp-employmentType-eq',
+      type: 'select',
+      label: '员工类型',
+      initialSource: employeeType
+    }] : []), [{
       name: 'qp-email-like',
       label: '邮箱'
     }, {
       name: 'qp-officeTelephone-like',
       label: '手机号'
-    }];
+    }]);
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/common/getTreeForOrgViewAndTenant"), {
       'orgViewCode': 'administrative-organization-view'
     })]).then(function (x) {
@@ -8449,13 +8463,22 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         render: function render(text) {
           return handleTextOverflow(text);
         }
-      }, {
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needTypeSearch) ? [{
+        title: '员工类型',
+        dataIndex: 'employmentType',
+        render: function render(text) {
+          var _employeeType$find;
+          return (_employeeType$find = employeeType.find(function (i) {
+            return i.value === text;
+          })) === null || _employeeType$find === void 0 ? void 0 : _employeeType$find.text;
+        }
+      }] : []), [{
         title: '邮箱',
         dataIndex: 'email'
       }, {
         title: '手机号',
         dataIndex: 'officeTelephone'
-      }]
+      }])
     }, modalTableBusProps);
   }
   // 配送方式选择器

package/dist/index.js

@@ -6635,6 +6635,13 @@ var sharingType = [{
   text: "私有",
   value: '20'
 }];
+var employeeType = [{
+  text: "外部员工",
+  value: '10'
+}, {
+  text: "内部员工",
+  value: '20'
+}];
 
 var getDicData = function getDicData(dicCode) {
   var dicData = {};
@@ -8388,12 +8395,14 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'name',
       mappingTextShowKeyField: 'username',
       mappingValueField: 'id',
-      otherParams: {
+      otherParams: _objectSpread2(_objectSpread2({
         'qp-enable-eq': 10,
-        'qp-employmentType-eq': 20,
-        'qp-orgViewIds-like': 'administrative-organization-view',
+        'qp-orgViewIds-like': 'administrative-organization-view'
+      }, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needTypeSearch) ? {} : {
+        'qp-employmentType-eq': 20
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'employeeNumber'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -8432,13 +8441,18 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
-    }, {
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needTypeSearch) ? [{
+      name: 'qp-employmentType-eq',
+      type: 'select',
+      label: '员工类型',
+      initialSource: employeeType
+    }] : []), [{
       name: 'qp-email-like',
       label: '邮箱'
     }, {
       name: 'qp-officeTelephone-like',
       label: '手机号'
-    }];
+    }]);
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/common/getTreeForOrgViewAndTenant"), {
       'orgViewCode': 'administrative-organization-view'
     })]).then(function (x) {
@@ -8468,13 +8482,22 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         render: function render(text) {
           return handleTextOverflow(text);
         }
-      }, {
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needTypeSearch) ? [{
+        title: '员工类型',
+        dataIndex: 'employmentType',
+        render: function render(text) {
+          var _employeeType$find;
+          return (_employeeType$find = employeeType.find(function (i) {
+            return i.value === text;
+          })) === null || _employeeType$find === void 0 ? void 0 : _employeeType$find.text;
+        }
+      }] : []), [{
         title: '邮箱',
         dataIndex: 'email'
       }, {
         title: '手机号',
         dataIndex: 'officeTelephone'
-      }]
+      }])
     }, modalTableBusProps);
   }
   // 配送方式选择器

package/package.json

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

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

@@ -1,6 +1,6 @@
 // 此文件用于 处理业务组件 所用到的公共方法
 // @ts-nocheck
-import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status } from './common';
+import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status, employeeType } from './common';
 import { getDictionarySource, getDictionaryTextByValue, loadSelectSource } from './utils';
 import { handleTextOverflow, tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
@@ -1519,8 +1519,8 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       mappingValueField: 'id',
       otherParams: {
         'qp-enable-eq': 10, // 启用状态 10-启用，20-禁用
-        'qp-employmentType-eq': 20,
-        'qp-orgViewIds-like':  'administrative-organization-view',
+        'qp-orgViewIds-like':  'administrative-organization-view', // 为了兼容 搜素所属组织机构时候需要传此参数
+        ...(modalTableBusProps?.needTypeSearch?{}:{'qp-employmentType-eq': 20}), // 10外部员工；20内部员工
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'employeeNumber',
@@ -1550,6 +1550,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
             dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
           },
         } },
+      ...(modalTableBusProps?.needTypeSearch?[{ name: 'qp-employmentType-eq', type: 'select', label: '员工类型', initialSource: employeeType  }]:[]),
       { name: 'qp-email-like', label: '邮箱' },
       { name: 'qp-officeTelephone-like', label: '手机号' },
     ]
@@ -1583,6 +1584,11 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
           dataIndex: 'administrativeNames',
           render: (text: any) => handleTextOverflow(text),
         },
+        ...(modalTableBusProps?.needTypeSearch?[{
+          title: '员工类型',
+          dataIndex: 'employmentType',
+          render: (text: number) => employeeType.find((i: any) => i.value === text)?.text,
+        }]:[]),
         {
           title: '邮箱',
           dataIndex: 'email',

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

@@ -61,4 +61,15 @@ const sharingType = [
   }
 ]
 
-export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status }
+const employeeType = [
+  {
+    text: "外部员工",
+    value: '10',
+  },
+  {
+    text: "内部员工",
+    value: '20',
+  }
+]
+
+export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status, employeeType }

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

@@ -1157,6 +1157,9 @@ export default () => {
   const props2 = {
     ...props,
     // prefixUrl: { selectPrefix: '/user/api', formSelectFix: '/user/api' },
+    modalTableProps: {
+      needTypeSearch: true
+    },
     selectBusinessType: 'employee2',
   }