@bit-sun/business-component 2.0.36 → 2.0.37

package/dist/index.esm.js

@@ -6708,9 +6708,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     // 版本2
     requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/employee/pageList/v2"),
-      filter: 'qp-employeeNumber,name-orGroup,like',
+      filter: 'qp-username,name-orGroup,like',
       mappingTextField: 'name',
-      mappingTextShowKeyField: 'employeeNumber',
+      mappingTextShowKeyField: 'username',
       mappingValueField: 'id',
       otherParams: {
         'qp-enable-eq': 10,
@@ -6720,12 +6720,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       sourceName: 'employeeNumber'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '员工名称'
-    }, {
-      name: 'qp-employeeNumber-like',
-      label: '员工编码'
+      name: 'qp-username-like',
+      label: '账户名称'
     }, {
+      name: 'qp-name-like',
+      label: '显示名称'
+    }, // { name: 'qp-employeeNumber-like', label: '员工编码' },
+    {
       name: 'qp-directOrgCode-in',
       type: 'select',
       label: '所属组织机构',
@@ -6755,15 +6756,23 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
-      modalTableTitle: '选择员工',
+      modalTableTitle: '添加员工',
       tableSearchForm: tableSearchForm,
       tableColumns: [{
-        title: '员工编码',
-        dataIndex: 'employeeNumber'
+        title: '账户名称',
+        dataIndex: 'username'
       }, {
-        title: '员工名称',
+        title: '显示名称',
         dataIndex: 'name'
-      }, {
+      }, // {
+      //   title: '员工编码',
+      //   dataIndex: 'employeeNumber',
+      // },
+      // {
+      //   title: '员工名称',
+      //   dataIndex: 'name',
+      // },
+      {
         title: '所属组织机构',
         dataIndex: 'directOrgName'
       }, {

package/dist/index.js

@@ -6718,9 +6718,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     // 版本2
     requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/employee/pageList/v2"),
-      filter: 'qp-employeeNumber,name-orGroup,like',
+      filter: 'qp-username,name-orGroup,like',
       mappingTextField: 'name',
-      mappingTextShowKeyField: 'employeeNumber',
+      mappingTextShowKeyField: 'username',
       mappingValueField: 'id',
       otherParams: {
         'qp-enable-eq': 10,
@@ -6730,12 +6730,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       sourceName: 'employeeNumber'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '员工名称'
-    }, {
-      name: 'qp-employeeNumber-like',
-      label: '员工编码'
+      name: 'qp-username-like',
+      label: '账户名称'
     }, {
+      name: 'qp-name-like',
+      label: '显示名称'
+    }, // { name: 'qp-employeeNumber-like', label: '员工编码' },
+    {
       name: 'qp-directOrgCode-in',
       type: 'select',
       label: '所属组织机构',
@@ -6765,15 +6766,23 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
-      modalTableTitle: '选择员工',
+      modalTableTitle: '添加员工',
       tableSearchForm: tableSearchForm,
       tableColumns: [{
-        title: '员工编码',
-        dataIndex: 'employeeNumber'
+        title: '账户名称',
+        dataIndex: 'username'
       }, {
-        title: '员工名称',
+        title: '显示名称',
         dataIndex: 'name'
-      }, {
+      }, // {
+      //   title: '员工编码',
+      //   dataIndex: 'employeeNumber',
+      // },
+      // {
+      //   title: '员工名称',
+      //   dataIndex: 'name',
+      // },
+      {
         title: '所属组织机构',
         dataIndex: 'directOrgName'
       }, {

package/package.json

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

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

@@ -1277,9 +1277,9 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     // 版本2
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/employee/pageList/v2`,
-      filter: 'qp-employeeNumber,name-orGroup,like', // 过滤参数
+      filter: 'qp-username,name-orGroup,like', // 过滤参数
       mappingTextField: 'name',
-      mappingTextShowKeyField: 'employeeNumber',
+      mappingTextShowKeyField: 'username',
       mappingValueField: 'id',
       otherParams: {
         'qp-enable-eq': 10, // 启用状态 10-启用，20-禁用
@@ -1290,8 +1290,9 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '员工名称' },
-      { name: 'qp-employeeNumber-like', label: '员工编码' },
+      { name: 'qp-username-like', label: '账户名称' },
+      { name: 'qp-name-like', label: '显示名称' },
+        // { name: 'qp-employeeNumber-like', label: '员工编码' },
       { name: 'qp-directOrgCode-in', type: 'select', label: '所属组织机构', field: {
           type: 'select',
           props: {
@@ -1315,17 +1316,25 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       formatSource(x,0, 2, tableSearchForm);
     })
     modalTableProps = {
-      modalTableTitle: '选择员工',
+      modalTableTitle: '添加员工',
       tableSearchForm,
       tableColumns: [
         {
-          title: '员工编码',
-          dataIndex: 'employeeNumber',
+          title: '账户名称',
+          dataIndex: 'username',
         },
         {
-          title: '员工名称',
+          title: '显示名称',
           dataIndex: 'name',
         },
+        // {
+        //   title: '员工编码',
+        //   dataIndex: 'employeeNumber',
+        // },
+        // {
+        //   title: '员工名称',
+        //   dataIndex: 'name',
+        // },
         {
           title: '所属组织机构',
           dataIndex: 'directOrgName',